Commit Graph

505 Commits

Author SHA1 Message Date
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
wangyidong
4488de2725 * adjust for priv. 2021-04-02 15:26:08 +08:00
wangyidong
266ea3e8d2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-02 14:07:24 +08:00
wangyidong
4a64b9df82 * adjust for project browse style. 2021-04-02 14:06:34 +08:00
leiyong
fdeab69b16 * Fix bug. 2021-04-02 08:14:56 +03:00
Yagami
86da04ad79 * Add upgrade version. 2021-04-02 09:35:12 +08:00
wangyidong
65fbc97385 * fix for create lib when create project. 2021-04-02 09:29:00 +08:00
Yagami
3dd13d66c5 * Fix upgrade logic. 2021-04-01 15:26:16 +08:00
wangyidong
4e545c0a40 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 11:35:41 +08:00
wangyidong
57f7d592ad * adjust for upgrade. 2021-04-01 11:35:23 +08:00
tianshujie98
227c8642de * Fix product custom whitelist upgrade issue. 2021-04-01 11:12:23 +08:00
tianshujie98
7f359558c1 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 15:10:20 +08:00
tianshujie98
1f66357244 * Fix bug #11015,11024. 2021-03-31 15:09:50 +08:00
wangyidong
bbda48740f * fix bug #11040. 2021-03-31 11:30:52 +08:00
tianshujie98
e1b120bb0a * Fix bug. 2021-03-31 08:20:50 +08:00
wangyidong
34347209e9 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 16:53:37 +08:00
wangyidong
5e98a02375 * finish task #36745. 2021-03-30 16:41:22 +08:00
Yagami
118e255325 * Fix bug drop menu link. 2021-03-30 14:41:45 +08:00
tianshujie98
7dec656959 * Fix bug #11112. 2021-03-30 13:50:48 +08:00
Yagami
5d2ffea599 * Fix upgrade logic. 2021-03-23 16:03:59 +08:00
wangyidong
5b731bfc89 * code for task #36745. 2021-03-16 16:15:38 +08:00
holan20180123
efb90c0b8c Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-12 09:35:44 +08:00
holan20180123
a5827af318 * Finish task #36473. 2021-03-12 09:35:14 +08:00
tianshujie98
11d818c80f * Adjust the project field of the zt_bug table. 2021-03-11 17:36:21 +08:00
wangyidong
cc64eafe95 * Adjust code for upgrade module. 2021-03-05 13:05:19 +08:00
holan20180123
7b03b87275 * Finish task #36028. 2021-03-03 11:17:48 +08:00
Yagami
aab57d7d25 * Finish task #36314. 2021-03-02 13:07:55 +08:00
Yagami
50e496f6d9 * Fix program status logic. 2021-02-26 09:46:17 +08:00
Yagami
8a42ba0f6e * Fix merge logic. 2021-02-26 09:19:51 +08:00
tianshujie98
ca3ee258ad * Finish task #36070. 2021-02-25 17:05:03 +08:00
holan20180123
0b8f4cb2ff * Finish task #36041. 2021-02-24 17:19:02 +08:00
holan20180123
02a0fd6e66 * Finish task #36041. 2021-02-24 17:11:33 +08:00
qiyu-xie
0f23c8706d * Fix the program name when selected product already has program. 2021-02-24 15:04:24 +08:00
holan20180123
eaa13b4280 * Finish task #36041. 2021-02-24 13:40:18 +08:00
holan20180123
f2606bb1e0 * Code for task #36041. 2021-02-24 11:32:01 +08:00
qiyu-xie
6547d09a91 * Finish task#36046. 2021-02-23 10:31:24 +08:00
wangyidong
8f57e6b652 * finish task #36004. 2021-02-22 15:31:20 +08:00
Yagami
b668ce1970 * Finish task #36028,#36068,#36072. 2021-02-22 11:05:30 +08:00
Yagami
d1f2c3cabd * Finish task #36070/#36069. 2021-02-20 16:00:16 +08:00
Yagami
7a50a4512c * Upgrade programs add order. 2021-02-20 13:42:18 +08:00
hufangzhou
62e481747d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 11:11:57 +08:00
hufangzhou
81f261dd64 * Finish task #36088. 2021-02-20 11:11:43 +08:00
holan20180123
05a30dd9aa * Finish task #36029,#36084. 2021-02-20 10:45:43 +08:00
wangyidong
6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00