Commit Graph
19799 Commits
Author SHA1 Message Date
Yagami 3d89f199fa * Fix bug #11564. 2021-03-25 16:40:06 +08:00
Yagami 1b20425cd1 * Fix code error. 2021-03-25 16:22:31 +08:00
zhujinyong 4054d473c2 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 16:18:25 +08:00
zhujinyong c5ae12b2da Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 16:18:17 +08:00
Yagami 1600eb1ba4 * Fix menu error. 2021-03-25 16:18:06 +08:00
qiyu-xie bae7e7ce16 * Fix bug#11490. 2021-03-25 16:17:38 +08:00
zhujinyong 0084d34097 * Ajust repo subMenu. 2021-03-25 16:10:23 +08:00
hufangzhou 9e5e24a687 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 16:05:35 +08:00
hufangzhou a0323a2b37 * Fix a bug. 2021-03-25 16:05:32 +08:00
Yagami ecee971a21 * Fix bug #11571. 2021-03-25 15:50:26 +08:00
qiyu-xie 30f0df8665 * Fix an error. 2021-03-25 15:48:29 +08:00
hufangzhou 15a369df75 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 15:43:28 +08:00
hufangzhou 4336d6ee8f * Fix bug #11510. 2021-03-25 15:43:24 +08:00
qiyu-xie 7798d08be7 * Fix bug#11572. 2021-03-25 15:38:59 +08:00
hufangzhou 9848b5e275 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 15:34:36 +08:00
hufangzhou 2c60644379 * Fix bug #11493. 2021-03-25 15:34:33 +08:00
leiyong 14ac058254 * Fix bug. 2021-03-25 15:27:42 +08:00
qiyu-xie e63a80253f * Fix bug#11488. 2021-03-25 15:26:02 +08:00
Catouse f7c077e364 * task #36890, improve UI of nested table. 2021-03-25 15:25:29 +08:00
Catouse 1cc238f010 * refactor: format. 2021-03-25 15:20:20 +08:00
leiyong 78940a5498 * Fix bug. 2021-03-25 14:58:11 +08:00
hufangzhou ca2c9403d3 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 14:55:55 +08:00
hufangzhou 92098c8717 * Fix a bug. 2021-03-25 14:55:50 +08:00
Catouse 8dcc7bcfc2 * task #36881, add hint to more button. 2021-03-25 14:52:09 +08:00
Catouse 4324798d20 * task #36881, move menu items to submenu when no space to show them. 2021-03-25 14:50:58 +08:00
Yagami 9b25cc961e * Fix detail for group. 2021-03-25 14:40:53 +08:00
qiyu-xie e46464f0e5 * Fix bug. 2021-03-25 14:37:32 +08:00
hufangzhou 073e30dbd8 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 14:12:20 +08:00
hufangzhou 6126983034 * Fix bug #11486. 2021-03-25 14:12:17 +08:00
Yagami f7703f2506 * Fix common menu. 2021-03-25 14:10:42 +08:00
qiyu-xie 505fc0a09f * Fix bug#11479. 2021-03-25 14:03:26 +08:00
hufangzhou 963225e386 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 13:43:50 +08:00
hufangzhou be42a804ce * Fix a bug. 2021-03-25 13:43:46 +08:00
leiyong 792416f4ad Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 13:41:31 +08:00
leiyong f5af9020c8 * Finish task#36884. 2021-03-25 13:41:25 +08:00
holan20180123 aea80f78f3 * Fix error. 2021-03-25 13:40:36 +08:00
wangyidong bded3a590f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 13:29:25 +08:00
wangyidong c4cfbc1e52 * fix error. 2021-03-25 13:29:08 +08:00
leiyong 820fcf1e38 * Fix bug. 2021-03-25 13:27:53 +08:00
qiyu-xie 891e456293 * Fix bug#11475. 2021-03-25 13:27:18 +08:00
wangyidong b030aecf0f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 13:21:59 +08:00
wangyidong 13b50741a2 * fix bug for edit dept. 2021-03-25 13:20:56 +08:00
qiyu-xie 4c07f75939 * Fix bug#11475. 2021-03-25 13:20:31 +08:00
holan20180123 8f08b4aa1e * Fix bug view error. 2021-03-25 13:18:21 +08:00
holan20180123 2e39ad4525 * Fix bug view in project app. 2021-03-25 13:10:46 +08:00
qiyu-xie 5f7e004151 * Fix bug#11475. 2021-03-25 13:06:35 +08:00
leiyong 6832646dbc * Fix bug. 2021-03-25 11:42:27 +08:00
holan20180123 63ebd77ff6 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-25 11:41:36 +08:00
holan20180123 ce1edb39fc * Finish task #36875. 2021-03-25 11:41:09 +08:00
leiyong 49d78a2bfb * Fix bug. 2021-03-25 11:38:45 +08:00