Commit Graph
23954 Commits
Author SHA1 Message Date
wangyidong d75672885d Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 10:31:20 +08:00
wangyidong 403b4b3760 * finish task #37271. 2021-04-12 10:31:00 +08:00
hufangzhou b8138c41cc * Fix bug #11953. 2021-04-12 10:27:45 +08:00
holan20180123 36c004af26 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 10:14:34 +08:00
holan20180123 182f6b9acd * Fix bug #11980. 2021-04-12 10:14:12 +08:00
leiyong 2220d9493a * Repair error. 2021-04-12 04:59:25 +03:00
holan20180123 6f46353bd2 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 09:54:00 +08:00
holan20180123 ba26806e18 * Fix bug #11974. 2021-04-12 09:53:41 +08:00
Yagami 1f29a2c621 * Fix bug #11979. 2021-04-12 09:53:40 +08:00
Yagami ea67994c31 * Fix bug #11979. 2021-04-12 09:48:57 +08:00
hufangzhou 72ce1729b9 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 09:31:17 +08:00
hufangzhou 7528daadd1 * Fix bug #11952. 2021-04-12 09:31:13 +08:00
tianshujie98 02c4f87a96 * Fix edit document error. 2021-04-12 09:09:29 +08:00
leiyong a09f161ee9 * Fix bug. 2021-04-09 13:33:43 +03:00
leiyong d0e21dee63 * Fix bug. 2021-04-09 13:16:24 +03:00
Yagami b89e3d0665 * Fix Version. 2021-04-09 17:13:32 +08:00
wangyidong 3da94c38fa Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 16:53:57 +08:00
wangyidong f1349cba2c * adjust for error. 2021-04-09 16:53:43 +08:00
leiyong dc0b429db4 * Fix bug. zentaopms_15.0.rc2_20210409 2021-04-09 11:47:15 +03:00
Yagami f5dde0e5df * Fix bug. 2021-04-09 16:46:30 +08:00
tianshujie98 76fd1b8a46 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 16:44:25 +08:00
tianshujie98 6d4e721cc6 * Fix bug #11926. 2021-04-09 16:44:10 +08:00
hufangzhou 2e20a06ffa Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 16:42:08 +08:00
hufangzhou d348f06080 * Adjust the code. 2021-04-09 16:42:02 +08:00
Yagami b003002dad * Fix delete link. 2021-04-09 16:40:42 +08:00
wangyidong fdfd2c324a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 16:38:13 +08:00
wangyidong 6d145002a1 * adjust for lang. 2021-04-09 16:37:57 +08:00
Yagami 7390d841e9 * Fix bug. 2021-04-09 16:37:31 +08:00
tianshujie98 55f0c763c4 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 16:34:42 +08:00
tianshujie98 edd4825045 * Fix bug #11934. 2021-04-09 16:34:26 +08:00
Yagami e3573e9627 * Fix en lang. 2021-04-09 16:34:23 +08:00
leiyong e99071291b * Fix bug#11925. 2021-04-09 11:30:21 +03:00
hufangzhou e340901bea Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 16:29:11 +08:00
hufangzhou 2c40f2e7e7 * Fix an error. 2021-04-09 16:29:08 +08:00
Yagami 8db49adccc * Fix bug. 2021-04-09 16:23:08 +08:00
tianshujie98 81c54448d3 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 16:22:07 +08:00
tianshujie98 cb365dbfe7 * Add execution doc lib menu. 2021-04-09 16:20:17 +08:00
hufangzhou c6ab53402e Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 15:46:47 +08:00
leiyong 186b455fdd * Fix bug. 2021-04-09 11:16:22 +03:00
Yagami d4400dd1cc * Fix execution all view style. 2021-04-09 16:00:34 +08:00
hufangzhou f8101d02b8 * Fix bug #11948. 2021-04-09 15:46:44 +08:00
Yagami 62bc93ee58 * Fix bug. 2021-04-09 14:52:03 +08:00
leiyong 142d614086 * Fix bug. 2021-04-09 09:49:37 +03:00
tianshujie98 c33405683a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 14:29:11 +08:00
tianshujie98 e480de3f77 * Remove create doc header. 2021-04-09 14:28:00 +08:00
Yagami c710bcc6d4 * Fix bug. 2021-04-09 14:10:59 +08:00
tianshujie98 ee8e74462f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 14:05:24 +08:00
tianshujie98 3d57b26610 * Fix bug #11840. 2021-04-09 14:05:05 +08:00
wangyidong 50054c62ae Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 13:56:21 +08:00
wangyidong 2e749c1738 * adjust for create story. 2021-04-09 13:56:08 +08:00