Commit Graph
434 Commits
Author SHA1 Message Date
Yagami 3bf3187bfe Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-02 11:28:04 +08:00
Yagami a1f4a8e7bb * Finish task #7812. 2020-09-02 11:27:34 +08:00
qiyu-xie 4c7e7ae2e5 *Add design module resource. 2020-09-02 11:09:15 +08:00
qiyu-xie 75b03bc73c *Fix group module lang. 2020-09-01 13:17:30 +08:00
Yagami f696462213 * Adjust code style. 2020-08-31 14:01:45 +08:00
Yagami 116a7e43b3 * Finish task #7721. 2020-08-31 13:34:32 +08:00
tianshujie98 ec4afb7863 *Finish task #7770. 2020-08-31 09:46:42 +08:00
Yagami 1b2228a367 * Adjust common/weekly code detail. 2020-08-29 13:21:46 +08:00
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
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
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
sgm0422 e480ce7902 * Code for cmmi. 2020-06-22 10:28:20 +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 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
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
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
wangyidong 9a30b4a9d4 * add priv for annualData. 2019-12-25 10:36:32 +08:00
wangyidong 52460dd80d * code for task #6708. 2019-12-10 15:45:06 +08:00
wangyidong ecbf8220da * add new version and upgrade. 2019-11-28 09:29:36 +08:00
wangyidong 87218f6f02 * finish task #6580. 2019-11-26 15:43:58 +08:00