Commit Graph

42 Commits

Author SHA1 Message Date
孙广明
8656350081 * Remove noproject merge method. 2021-11-25 15:28:54 +08:00
tianshujie
993a02eb78 * Fix bug #15521. 2021-10-14 11:31:38 +08:00
tianshujie
880c8893c8 * Fix bug #15484. 2021-10-13 15:11:26 +08:00
tianshujie98
752f6e2350 * Finish task #41725. 2021-08-23 14:50:09 +08:00
tianshujie98
9491fa4a5c * Ajust code. 2021-07-16 16:33:36 +08:00
tianshujie98
f8a107bd79 * Adjust code. 2021-07-15 17:27:25 +08:00
tianshujie98
8064db6050 * Fix bug #13663. 2021-07-15 13:14:00 +08:00
tianshujie98
309f6047ee * Fix logic problems. 2021-07-13 10:11:34 +08:00
tianshujie98
bad9c9e042 * Finish task #40016,40017. 2021-07-12 14:52:46 +08:00
tianshujie98
5e1e83721a * Add language item. 2021-07-10 00:40:33 +08:00
tianshujie98
64ac581298 * Modify language items. 2021-06-04 16:12:59 +08:00
tianshujie98
c1c5924dce * Modify language items. 2021-04-02 11:41:25 +08:00
wangyidong
cc64eafe95 * Adjust code for upgrade module. 2021-03-05 13:05:19 +08:00
holan20180123
b5a16df369 * Code for task #36028. 2021-03-03 11:09:34 +08:00
holan20180123
bc0c65f776 * Code for task #36028. 2021-03-03 10:46:15 +08:00
Yagami
aab57d7d25 * Finish task #36314. 2021-03-02 13:07:55 +08:00
qiyu-xie
0f23c8706d * Fix the program name when selected product already has program. 2021-02-24 15:04:24 +08:00
holan20180123
f2606bb1e0 * Code for task #36041. 2021-02-24 11:32:01 +08:00
Yagami
4319d006b8 * Fix bug. 2021-02-23 16:28:05 +08:00
qiyu-xie
6547d09a91 * Finish task#36046. 2021-02-23 10:31:24 +08:00
wangyidong
6787d19ac7 * finish task #36010. 2021-02-22 13:04:18 +08:00
Yagami
b668ce1970 * Finish task #36028,#36068,#36072. 2021-02-22 11:05:30 +08:00
qiyu-xie
ff8bb44ada * Fix bug. 2021-02-22 09:04:00 +08:00
qiyu-xie
83c4669281 * Finish task#36086. 2021-02-20 17:00:25 +08:00
Yagami
75136c6365 * Remove unused code. 2021-02-20 14:12:29 +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
6c7d50e989 * Finish task #36085. 2021-02-20 10:55:24 +08:00
holan20180123
05a30dd9aa * Finish task #36029,#36084. 2021-02-20 10:45:43 +08:00
leiyong
4f4f6cbf9d * Adjust upgrade module. 2020-11-20 14:38:28 +08:00
leiyong
22a0fb1922 * Adjust the upgrade module mergeprogram.js file. 2020-11-19 17:50:18 +08:00
leiyong
55976aeb26 * Query the program and project logic when upgrading. 2020-11-19 17:32:08 +08:00
Yagami
7eaf1d34e1 * Adjust code. 2020-11-19 08:53:47 +08:00
leiyong
811e7a9de8 * Fix bug. 2020-11-17 15:28:12 +08:00
leiyong
ef4db941b7 * Finish task#8301. 2020-11-17 14:03:10 +08:00
Yagami
b4ea03a2fd * Fix details. 2020-10-29 14:04:46 +08:00
Yagami
0f3348ad2a * Finish task #8164. 2020-10-27 14:46:03 +08:00
Yagami
27986da851 * Code for task #8164. 2020-10-26 16:36:32 +08:00
Yagami
5082e5a913 * Add upgrade view. 2020-10-26 16:36:32 +08:00
Yagami
a16da916ab * Rename PRJadmin to PRJAdmin. 2020-10-20 14:18:39 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
z
79db80e3b4 * adjust for merge program style. 2020-06-16 10:39:01 +08:00