Commit Graph
24899 Commits
Author SHA1 Message Date
hufangzhou 8a5d9c8bb5 * Adjust the code. 2021-06-16 15:05:18 +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
hufangzhou 778c8c79eb Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-05 15:26:36 +08:00
hufangzhou bc207f4700 * Finish task #38900. 2021-06-05 15:26:26 +08:00
qiyu-xie 69532aba77 * Finish task#38909. 2021-06-05 12:02:38 +08:00
qiyu-xie 09b760415e * Fix create execution bug. 2021-06-05 11:05:41 +08:00
wangyidong 1ed3ae021b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-05 10:59:55 +08:00
wangyidong 6132743c6b * fix bug #13074. 2021-06-05 10:59:27 +08:00
qiyu-xie 72809c5087 * Fix action bug. 2021-06-05 10:37:29 +08:00
hufangzhou f4f0e83f28 * Fix a bug. 2021-06-05 00:57:02 +08:00
hufangzhou 0b25ff55bd * Finish task #38895. 2021-06-05 00:43:20 +08:00
hufangzhou b3d33fd10f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 23:54:10 +08:00
hufangzhou dd4999de53 * Finish task #38896. 2021-06-04 23:54:03 +08:00
tianshujie98 f3921abf0a * Finish task #38922. 2021-06-04 22:41:29 +08:00
hufangzhou cf74e5728c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 22:22:13 +08:00
hufangzhou b645d23e55 * Finish task #38923. 2021-06-04 22:22:07 +08:00
qiyu-xie d38cfbd23e * Finish task#38911. 2021-06-04 22:16:39 +08:00
hufangzhou fc473ab743 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 22:15:03 +08:00
hufangzhou 15ee092857 * Finish task #38925. 2021-06-04 22:14:54 +08:00
tianshujie98 0eb60e6129 * Finish task #38921. 2021-06-04 21:55:57 +08:00
qiyu-xie 0ccc2c3f28 * Finish task#38926. 2021-06-04 18:03:28 +08:00
tianshujie98 3dbe2cde46 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 17:30:43 +08:00
tianshujie98 80b876383c * Finish task #38920. 2021-06-04 17:30:09 +08:00