Commit Graph
548 Commits
Author SHA1 Message Date
tianshujie98 309f6047ee * Fix logic problems. 2021-07-13 10:11:34 +08:00
tianshujie98 106ffc839e * Finish task #40011. 2021-07-12 16:34:59 +08:00
tianshujie98 bad9c9e042 * Finish task #40016,40017. 2021-07-12 14:52:46 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
wangyidong aedf5935d1 + add version and upgrade. 2021-06-24 13:17:04 +08:00
wangyidong 11b261b4ca * adjust for upgrade. 2021-06-24 11:24:32 +08:00
wangyidong 205129859f * finish task #38732. 2021-06-21 15:02:35 +08:00
wangyidong 5e371ace2d * add new version and upgrade. 2021-06-12 15:46:12 +08:00
wangyidong 3fe8523aba * adjust for upgrade. 2021-06-06 18:33:33 +08:00
wangyidong 9a0512f334 * add zh-tw lang. 2021-06-06 09:46:11 +08:00
wangyidong ce35cfd368 * change version. 2021-06-06 09:29:56 +08:00
wangyidong b6676572f0 * merge from 15.0.beta3. 2021-06-06 09:05:34 +08:00
wangyidong 0fb37ae0f6 * adjust for upgrade. 2021-06-05 15:39:07 +08:00
wangyidong a07123b8cb * adjust for upgrade. 2021-06-05 15:22:26 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +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
hufangzhou b645d23e55 * Finish task #38923. 2021-06-04 22:22:07 +08:00
hufangzhou 7456301e30 * Fix bug #12482. 2021-06-01 15:29:15 +08:00
holan20180123 cf907e8325 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 10:10:10 +08:00
holan20180123 3f446e63a6 * Fix bug 12732. 2021-06-01 10:09:45 +08:00
wangyidong 29627e372f * fix bug #38652. 2021-05-31 17:12:13 +08:00
wangyidong 5206f44c1e * adjust for upgrade. 2021-05-21 16:59:19 +08:00
hufangzhou 93d80f1321 * Adjust the code. 2021-05-07 16:11:14 +08:00
hufangzhou 12c783069d * Fix bug #12482. 2021-05-07 13:22:21 +08:00
hufangzhou 78f08ca700 * Adjust the code. 2021-05-06 16:03:37 +08:00
hufangzhou e03fa8da3f * Finish task #37922. 2021-05-06 13:26:44 +08:00
wangyidong d95cbe7dcb * adjust for upgrade. 2021-05-06 13:02:01 +08:00
wangyidong 8fbb5c1c89 * adjust for upgrade. 2021-04-30 11:23:46 +08:00
wangyidong f8f39f8f95 * change for upgrade. 2021-04-29 13:05:34 +08:00
hufangzhou 485e2c4d46 * Fix bug #12451. 2021-04-29 11:30:19 +08:00
tianshujie98 08da42d6f4 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 14:54:46 +08:00
tianshujie98 2ec29e2c70 * Fix bug #12031. 2021-04-28 14:54:22 +08:00
hufangzhou 09acfbbc53 * Modify the project doc lib acl when the project acl is program. 2021-04-28 11:00:28 +08:00
hufangzhou 1c1b100a69 * Adjust the project doclib acl when merge data. 2021-04-27 16:57:31 +08:00
wangyidong 1fc9c2e6ca * fix bug. 2021-04-26 11:14:11 +08:00
wangyidong f4d3ad864b * adjust for upgrade. 2021-04-16 13:16:04 +08:00
holan20180123 57450ee56e * Finish task #37526. 2021-04-15 14:51:10 +08:00
Yagami 352fcc29b9 * Add upgrade logic. 2021-04-14 10:01:59 +08:00
leiyong e558b28a24 * Fix bug#11971. 2021-04-12 10:22:56 +03:00
leiyong 142d614086 * Fix bug. 2021-04-09 09:49:37 +03:00
wangyidong 44a6ed5a8c * fix for bug #11891. 2021-04-09 12:11:48 +08:00
wangyidong 8a031d2ca4 * fix bug #11889. 2021-04-08 10:45:52 +08:00
wangyidong 4a902c7e75 * adjust for 15. 2021-04-07 17:40:05 +08:00
wangyidong c1fdb0bbc0 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-07 14:53:01 +08:00
wangyidong f7f7bdc651 * adjust for upgrade. 2021-04-07 14:50:40 +08:00
wangyidong 0ca7f575aa * adjust upgrade. 2021-04-07 14:45:13 +08:00
leiyong a892be6db3 * Fix bug#11020,task#37298. 2021-04-07 08:26:52 +03:00
Yagami d743f24768 * Fix upgrade error. 2021-04-06 11:42:56 +08:00
wangyidong fa574273ac * adjust for upgrade. 2021-04-02 15:54:43 +08:00