Commit Graph

106 Commits

Author SHA1 Message Date
王怡栋
3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
王怡栋
a459f5fd47 * fix bug for set actions. 2021-11-01 15:15:28 +08:00
liyuchun
c7e3f11892 * Fix bug #15541. 2021-10-18 11:27:01 +08:00
liyuchun
672598aada * Fix bug #15541. 2021-10-18 10:39:15 +08:00
liyuchun
c8fe1f5e14 * Fix bug #15541. 2021-10-18 10:21:08 +08:00
liyuchun
e3291b0e2a * Fix bug #15541. 2021-10-18 09:07:11 +08:00
tianshujie
d9ffc89d5e * Fix bug #15541. 2021-10-15 13:57:27 +08:00
liyuchun
9f36655aea * Finish task #43205. 2021-10-13 15:29:53 +08:00
wangyidong
1af22a4ae1 * finish task #38717. 2021-06-21 16:09:21 +08:00
holan20180123
af0a85083b * Fix bug #12627. 2021-06-07 09:15:44 +08:00
wangyidong
769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
wangyidong
bbda48740f * fix bug #11040. 2021-03-31 11:30:52 +08:00
Yagami
56da31b345 * FIx bug. 2021-03-17 14:01:48 +08:00
Yagami
39ae71ddcb * Remove all menugroup. 2021-03-17 13:56:42 +08:00
hufangzhou
fc9ae73dbf * Adjust the code. 2021-03-11 13:47:46 +08:00
hufangzhou
ae3f1cb1ed * Adjust the code. 2021-03-11 13:42:45 +08:00
qiyu-xie
c015dc5910 * Remove redundant code. 2021-03-05 16:57:36 +08:00
qiyu-xie
c010c42b08 * Modify group module. 2021-03-04 15:21:01 +08:00
Yagami
294058ddcd * Finish task #36358 and rename mode. 2021-03-02 10:13:51 +08:00
Yagami
79e1029298 * Fix code review error. 2021-02-26 17:34:07 +08:00
Yagami
95dbdc51c2 * Fix prjbrowse priv bug. 2021-02-25 17:04:46 +08:00
Yagami
a7c118d491 * Code for old/new mode. 2021-02-25 14:42:39 +08:00
Yagami
fd672669f7 * Fix details. 2021-01-20 16:40:31 +08:00
tianshujie98
6d61bc7129 * Modify the variables of the group module. 2020-12-17 11:00:26 +08:00
leiyong
71a6c3b318 * Fix upgrade errors. 2020-10-29 16:37:02 +08:00
leiyong
1ab465d4d7 * Modify upgrade whitelist. 2020-10-29 11:37:09 +08:00
leiyong
0909592ea1 * Adjust whitelist setting logic. 2020-10-28 09:14:38 +08:00
leiyong
efd978eb95 * Adjustment Code. 2020-10-20 17:27:04 +08:00
Yagami
a16da916ab * Rename PRJadmin to PRJAdmin. 2020-10-20 14:18:39 +08:00
Yagami
9757e21c75 * Change program to PRJ. 2020-09-21 13:21:14 +08:00
leiyong
3550097dc8 * Add project authority management function. 2020-09-20 22:57:24 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
Yagami
bc69f6fb81 * Finish task #7772. 2020-08-31 13:05:24 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
sgm0422
0e9b3e9609 * Fix details. 2020-06-16 17:24:14 +08:00
sgm0422
19a1db72df * Fix user view bug. 2020-06-16 14:15:22 +08:00
sgm0422
2d97663c5d * Compute program priv. 2020-06-11 17:25:36 +08:00
sgm0422
c4fc2c99b1 * Fix menu and add program group. 2020-06-11 13:23:03 +08:00
sgm0422
4fbd9f6fd2 * Finish task #7234. 2020-06-10 14:10:09 +08:00
leiyong
b3b567bc89 * Finish task#7201,task#7189,task#7188,task#7185. 2020-05-10 23:57:42 -07:00
wangyidong
87218f6f02 * finish task #6580. 2019-11-26 15:43:58 +08:00
wangyidong
b4b96c2101 * finish task #6561. 2019-11-19 13:56:45 +08:00
Yagami
5d2f8443ab * Finish task #6499. 2019-11-18 11:14:03 +08:00
wangyidong
2f62ecb51e * finish task #6444. 2019-10-12 14:50:00 +08:00
wangyidong
920855f5df * adjust for manage actions. 2019-05-08 09:02:09 +08:00
wangyidong
861115d3b7 * adjust for all checker. 2019-05-07 17:09:35 +08:00
yfl
6db8a4e7b2 Merge branch 'master' of https://github.com/easysoft/zentaopms
* Task #5423
2019-05-06 16:33:10 +08:00
chenfeiCF
1650ba3592 * Finish task #5129. 2018-11-15 14:10:27 +08:00
wangyidong
ab890a2606 * adjust for task #4895. 2018-09-20 15:02:50 +08:00
Yagami
2f468832aa * Fix groupModel-updateUser method. 2018-09-20 14:42:37 +08:00