Commit Graph
24920 Commits
Author SHA1 Message Date
tianshujie98 57d390129c Fix an error. 2021-06-18 09:54:11 +08:00
Hao Sun c8eadb2ce9 * update datetimepicker. 2021-06-18 09:54:48 +08:00
hufangzhou 5ee795330e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-18 09:25:54 +08:00
hufangzhou b7caec933d * Adjust the code. 2021-06-18 09:25:50 +08:00
tianshujie98 abe711e334 * Finish task #39450. 2021-06-18 09:10:40 +08:00
tianshujie98 53cf8a8b2a * Finish task #39451. 2021-06-18 09:05:37 +08:00
qiyu-xie a73d28f969 * Finish task#39387. 2021-06-18 08:59:24 +08:00
hufangzhou db2212743b * Finish task #39452. 2021-06-18 08:05:38 +08:00
hufangzhou 23206c4ea8 * Finish task #39453. 2021-06-17 17:43:56 +08:00
tianshujie98 52246b07cc * Adjust code. 2021-06-17 14:26:12 +08:00
Hao Sun 69bfc9917f * task #38754, bug #11135, support for adding child step for group automatically. 2021-06-17 11:41:32 +08:00
hufangzhou b09234b272 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-16 17:26:06 +08:00
hufangzhou 0dd6c819a9 * Adjust the code. 2021-06-16 17:26:01 +08:00
tianshujie98 afa6c54f93 * Adjust code. 2021-06-16 17:14:31 +08:00
hufangzhou 69538f2cb7 * Adjust the source select control width in batch create page. 2021-06-16 17:12:25 +08:00
holan20180123 1867f60ff5 * Adjust story view. 2021-06-16 16:28:43 +08:00
holan20180123 51cf208621 * Adjust batch edit story. 2021-06-16 15:37:06 +08:00
hufangzhou 387899f28e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-16 15:05:21 +08:00
hufangzhou 8a5d9c8bb5 * Adjust the code. 2021-06-16 15:05:18 +08:00
tianshujie98 420a526d54 * Adjust code. 2021-06-16 14:08:34 +08:00
tianshujie98 08d176663e * Fix dynamic issues. 2021-06-16 13:45:40 +08:00
tianshujie98 941525e672 * Adjust the jump app. 2021-06-16 13:31:34 +08:00
tianshujie98 2ab2964fe5 * Fix work and contribute navigation permission check issues. 2021-06-16 11:12:30 +08:00
holan20180123 550f8c4817 * Adjust create and edit story. 2021-06-16 09:25:21 +08:00
tianshujie98 5a6630e11e * Adjust code. 2021-06-15 17:12:40 +08:00
qiyu-xie e8f7d97a51 * Add lt and le lang. 2021-06-15 16:41:45 +08:00
tianshujie98 c22b78a555 * Fix the problem of pending block. 2021-06-15 16:38:50 +08:00
tianshujie98 4de6fa1c01 * Ajust page. 2021-06-15 11:03:20 +08:00
qiyu-xie 3ecc5e262e * Fix bug#13138. 2021-06-15 09:46:44 +08:00
tianshujie98 48ddd1957b * Adjust code. 2021-06-12 21:32:31 +08:00
tianshujie98 16b3845b2e * Add meeting to pending block. 2021-06-12 21:06:57 +08:00
tianshujie98 d179eec394 * Add meeting to pending. 2021-06-12 18:56:39 +08:00
hufangzhou 1f9f3a9d17 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-11 15:34:38 +08:00
hufangzhou 48353b2897 * Finish task #39093. 2021-06-11 15:34:31 +08:00
Yagami e42385a1c3 * Modify custom setting verify. 2021-06-11 13:52:02 +08:00
tianshujie98 f7e9df2037 * Add session. 2021-06-10 15:22:36 +08:00
qiyu-xie 95b253b75f * Add outline and schedule for create change. 2021-06-10 10:51:16 +08:00
tianshujie98 aed100aaf0 * Adjust code. 2021-06-10 10:01:41 +08:00
tianshujie98 5e313ffdf3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-09 13:12:31 +08:00
tianshujie98 36691f54c0 * Finish task #39086. 2021-06-09 13:12:17 +08:00
hufangzhou e4023e6b99 * Adjust the code. 2021-06-09 11:47:22 +08:00
wangyidong 3fe8523aba * adjust for upgrade. zentaopms_15.0.1_20210606 2021-06-06 18:33:33 +08:00
wangyidong ce35cfd368 * change version. 2021-06-06 09:29:56 +08:00
wangyidong 387b09e25c Merge branch '15.0.beta3' 2021-06-06 09:27:45 +08:00
wangyidong 9c166e59d0 * adjust for task #38876. 2021-06-06 08:32:49 +08:00
tianshujie98 fe58d5f20e * Fix bug #13082. 2021-06-05 21:09:16 +08:00
hufangzhou 3f7d702a82 * Fix bug #13066. 2021-06-05 18:32:13 +08:00
hufangzhou fcf1d669d7 * Revert the changed code of task #38644. 2021-06-05 18:14:44 +08:00
qiyu-xie e03bc08d00 * Finish task#38881. 2021-06-05 16:24:32 +08:00
wangyidong 0fb37ae0f6 * adjust for upgrade. 2021-06-05 15:39:07 +08:00