Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
18,637 Commits 2 Branches 292 Tags
189c0928d250e57ef28f6a3656331663c874d71c
Commit Graph
626 Commits
Author SHA1 Message Date
holan20180123 22f5c0b363 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 13:48:23 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
leiyong 5c6c487580 * Adjust menu。 2020-08-27 13:34:36 +08:00
Yagami 39f3fffed8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 13:02:29 +08:00
Yagami d117275c5b * Fix group programs. 2020-08-27 13:01:57 +08:00
qiyu-xie 9ca95ac3e6 *Add design assignTo priv. 2020-08-27 11:30:45 +08:00
leiyong df1a9ee5ef * Finish task#7702. 2020-08-27 09:23:10 +08:00
leiyong 06e5748f12 * Adjust lang file. 2020-08-27 09:11:23 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
tianshujie98 1011f0cb0e * Checkout module/group/lang/resource.php xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php 2020-08-25 15:30:10 +08:00
tianshujie98 60fcf05741 * Delete empty line. 2020-08-25 14:53:50 +08:00
tianshujie98 36ca024811 * Add stdclass. 2020-08-25 14:51:07 +08:00
tianshujie98 4e03358c25 * Add group/lang/resource.php. 2020-08-25 13:39:50 +08:00
tianshujie98 1efa74380e * Add group/lang/resource.php. 2020-08-25 13:21:18 +08:00
Yagami 539283311c Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-20 17:28:25 +08:00
Yagami 0f91511fe4 * Fix design details. 2020-08-20 17:28:02 +08:00
holan20180123 f5319cee4e * Code for block riskList. 2020-08-20 16:27:26 +08:00
tianshujie98 c23c6e721c * Finish task #7628. 2020-08-20 10:15:58 +08:00
Yagami cc7db91b5e * Add program blocks. 2020-08-19 17:34:22 +08:00
leiyong 664f561814 * Restore permissions 2020-08-14 16:57:40 +08:00
leiyong 9e1fb72286 * Adjustment of authority. 2020-08-07 15:30:06 +08:00
leiyong 00f871efdb * Delete authority. 2020-08-06 18:55:25 -07:00
leiyong 388ee126ef * Fix bug 2020-07-20 18:41:24 -07:00
leiyong 5eca3c956e * Adjust style. 2020-07-16 01:33:28 -07:00
chenfei 6f80a12fd8 * Fix bug #3262. 2020-07-09 13:17:31 +08:00
z 7ab4e53714 * finish task #7274. 2020-06-28 11:26:54 +08:00
z bf1912f0d6 * fix bug for get groups with program. 2020-06-23 16:59:41 +08:00
sgm0422 e480ce7902 * Code for cmmi. 2020-06-22 10:28:20 +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 5c5ef4eb0c * Fix acl and rights. 2020-06-12 16:41:40 +08:00
sgm0422 2d97663c5d * Compute program priv. 2020-06-11 17:25:36 +08:00
sgm0422 cfbba4b4bb * Code for task #7235. 2020-06-11 14:41:08 +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
wangyidong 440f5100ce * move requirement method to pro. 2020-05-29 13:43:18 +08:00
leiyong b3b567bc89 * Finish task#7201,task#7189,task#7188,task#7185. 2020-05-10 23:57:42 -07:00
leiyong e8527692f5 * Finish task#7100. 2020-04-29 23:19:51 -07:00
leiyong c551170d6b * finish task#7112,#7113,#7111. 2020-04-29 02:02:51 -07:00
wangyidong 523162eac5 * add new version and upgrade and add vi lang. 2020-04-10 13:55:45 +08:00
wangyidong 74bd767a6e * adjust for en and zh-tw lang. 2020-04-08 14:36:37 +08:00
wangyidong c9ce71628f * add priv for commitResult. 2020-04-03 09:01:47 +08:00
wangyidong 1687ac4e65 * add new version and upgrade. 2020-03-25 14:30:48 +08:00
wangyidong a9024bd0bd * fix bug #3046. 2020-03-25 11:43:19 +08:00
wangyidong 904df3224b * add new version and upgrade. 2020-03-10 15:14:18 +08:00
wangyidong a694c8493f * change comment to commit. 2020-03-06 18:27:21 +08:00
wangyidong 24f67c7441 * change for priv. 2020-02-13 17:18:44 +08:00
leiyong 90ec6f30df 1.fix bug #2931 
2.fix bug #2924
3.fix bug #2919
4.fix bug #2917
5.fix bug #2914
6.fix bug #2913
7.fix bug #2910
8.fix bug #2904
9.fix bug #2897
10.fix bug #2896
11.fix bug #2894
 2020-02-04 15:40:31 +08:00
wangyidong 3b46b72191 * remove annualData priv. 2020-01-03 11:00:22 +08:00
wangyidong 3dabfc1b45 * adjust code. 2020-01-02 10:00:17 +08:00