Commit Graph
24860 Commits
Author SHA1 Message Date
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
hufangzhou d83af0420d * Finish task #38898. 2021-06-04 17:28:48 +08:00
hufangzhou 7c1e69e3e0 * Finish task #38901, task #38899. 2021-06-04 17:25:07 +08:00
qiyu-xie 18ca3cbb99 * Finish task#38910. 2021-06-04 17:19:08 +08:00
tianshujie98 e4f221bf59 * Finish task #38917. 2021-06-04 16:41:38 +08:00
tianshujie98 ca9a6ba037 * Modify language items. 2021-06-04 16:21:19 +08:00
tianshujie98 d83d07dd68 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 16:13:21 +08:00
tianshujie98 64ac581298 * Modify language items. 2021-06-04 16:12:59 +08:00
wangyidong e14b3a6b42 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 16:07:13 +08:00
wangyidong 8d1ca6b022 * finish task #38890. 2021-06-04 15:59:01 +08:00
tianshujie98 3d91cef47c * Finish task #38919. 2021-06-04 15:47:43 +08:00
tianshujie98 954b1d5a35 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 15:46:12 +08:00
tianshujie98 10d2d37ee6 * Finish task #38918. 2021-06-04 15:45:59 +08:00
wangyidong 1a11405e6b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 15:36:42 +08:00
wangyidong e858eb9d98 * fix bug. 2021-06-04 15:36:26 +08:00
tianshujie98 635515190f * Finish task #38878. 2021-06-04 15:24:53 +08:00
tianshujie98 fd979e7e32 * Finish task #38888. 2021-06-04 15:20:59 +08:00
tianshujie98 849d43b4b2 * Fix action bug. 2021-06-04 15:06:02 +08:00
qiyu-xie dbb2d5f650 * Adjust code. 2021-06-04 14:41:08 +08:00
tianshujie98 266c354102 * Finish task #38877. 2021-06-04 14:26:49 +08:00
tianshujie98 0eef651b56 * finish task #38880. 2021-06-04 13:57:20 +08:00
tianshujie98 c587c18b46 * Finish task #38889. 2021-06-04 13:18:23 +08:00
tianshujie98 bebed24d04 * Finish task #38894. 2021-06-04 12:49:40 +08:00
wangyidong 9d1876b009 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 12:11:22 +08:00
wangyidong f6594c7022 * adjust version and adjust test. 2021-06-04 12:10:48 +08:00