Commit Graph

411 Commits

Author SHA1 Message Date
leiyong
f409040e3c Merge branch 'master' of github.com:easysoft/zentaopms 2020-10-29 16:39:14 +08:00
leiyong
71a6c3b318 * Fix upgrade errors. 2020-10-29 16:37:02 +08:00
Yagami
b4ea03a2fd * Fix details. 2020-10-29 14:04:46 +08:00
Yagami
30d7bb81b7 * Fix details. 2020-10-28 14:39:36 +08:00
Yagami
a52a622ce4 * Merge code. 2020-10-28 11:45:26 +08:00
leiyong
0909592ea1 * Adjust whitelist setting logic. 2020-10-28 09:14:38 +08:00
Yagami
104d25ff49 * Fix bug. 2020-10-27 16:09:05 +08:00
leiyong
abf386a1e3 * Adjust whitelist deletion logic. 2020-10-27 16:08: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
a16da916ab * Rename PRJadmin to PRJAdmin. 2020-10-20 14:18:39 +08:00
holan20180123
7f49f1f614 * Finish task #8085. 2020-10-12 15:49:46 +08:00
holan20180123
9d90cc9541 * Finish task #8090. 2020-10-12 10:57:49 +08:00
Yagami
4209766be3 * Rename var name. 2020-09-30 17:18:24 +08:00
Yagami
92ee6ca3b2 * Rename program to prj. 2020-09-22 11:31:56 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
hufangzhou
ef02c8fc68 * Finish task#7740. 2020-08-31 17:22:18 +08:00
Yagami
b3e27f70b3 * Mv milestone to qc. 2020-08-27 11:17:22 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z
23d070d622 * finish task #7643, 2020-08-24 10:18:53 +08:00
z
2d59fe5555 * finish task #7646. 2020-08-19 16:41:58 +08:00
z
538d6a9b40 * finish task #7647. 2020-08-19 16:29:04 +08:00
z
cad991a948 * add new version and upgrade. 2020-08-10 13:37:28 +08:00
z
1cc523fd01 * adjust code. 2020-07-27 16:44:23 +08:00
z
1e932f160c * add new version and upgrade. 2020-07-27 14:14:19 +08:00
chenfei
7c2e311ac0 * Finish task #7552. 2020-07-26 22:07:38 +08:00
chenfei
7e48d40719 * Finish task #7543. 2020-07-26 21:52:31 +08:00
z
9b835f13fd * finish task #7534. 2020-07-24 20:57:32 +08:00
z
1c8d874053 * code for task #7469. 2020-07-23 16:43:16 +08:00
z
7bca29aeec * code for task #7469. 2020-07-23 15:59:18 +08:00
sgm0422
1cfb7aa651 * Finish task #7353. 2020-07-15 13:27:35 +08:00
z
d5a2b481ee * add new version and upgrade. 2020-07-02 10:14:16 +08:00
z
3a391ea836 * finish task #7277. 2020-06-22 14:30:52 +08:00
sgm0422
a90ceec8fd * Fix program priv. 2020-06-17 10:39:51 +08:00
sgm0422
74a663af11 * Merge sql to zentao.sql. 2020-06-16 15:15:47 +08:00
z
4eff282d98 Merge branch '15.x' of github.com:easysoft/zentaopms into 15.x 2020-06-16 10:39:43 +08:00
z
79db80e3b4 * adjust for merge program style. 2020-06-16 10:39:01 +08:00
z
70ed978c2d * adjust for merge program. 2020-06-15 16:24:00 +08:00
sgm0422
1f162f9c35 * Add init user view method. 2020-06-15 13:33:37 +08:00
z
1f42d3867d * set program team. 2020-06-12 16:40:26 +08:00
z
2327aa145a * change for merge program. 2020-06-12 10:58:58 +08:00
z
da8d8b55d3 * change for merge program. 2020-06-12 09:07:07 +08:00
sgm0422
c02319385c * Fix install and upgrade logic. 2020-06-05 15:48:57 +08:00
sgm0422
13597923a1 * Fix install && upgrade sql. 2020-06-05 15:12:05 +08:00
z
2539193d30 * add new version and upgrade. 2020-06-01 14:58:04 +08:00
wangyidong
65c64de03a * add new version and upgrade. 2020-05-15 13:03:14 +08:00
wangyidong
523162eac5 * add new version and upgrade and add vi lang. 2020-04-10 13:55:45 +08:00
wangyidong
1687ac4e65 * add new version and upgrade. 2020-03-25 14:30:48 +08:00
wangyidong
cfa5261960 * finish task #6902 and merge xuanxuan. 2020-03-17 16:38:44 +08:00
wangyidong
904df3224b * add new version and upgrade. 2020-03-10 15:14:18 +08:00