Commit Graph

710 Commits

Author SHA1 Message Date
Yagami
25020888fa * Fix bug. 2021-01-18 11:35:23 +08:00
holan20180123
2c95668f2e * Finish task #9002. 2021-01-14 15:46:23 +08:00
Yagami
c6ab1d3809 * Code for task #9028. 2021-01-14 10:48:37 +08:00
tianshujie98
eced7f1d3f Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-13 15:56:29 +08:00
tianshujie98
347764eb91 * Add permissions. 2021-01-13 15:53:33 +08:00
Yagami
2ed477ae56 * Code for task #9028. 2021-01-13 15:43:20 +08:00
hufangzhou
797f353864 * Finish task#8958, task#8960. 2021-01-12 14:50:21 +08:00
leiyong
fef12243f1 * Finish task#8760. 2020-12-30 17:29:32 +08:00
leiyong
ce30edb39d * Adjust group. 2020-12-25 13:41:19 +08:00
leiyong
576fa7d7bf * Adjust the program and project operation buttons. 2020-12-25 13:35:01 +08:00
Yagami
af6d05cf29 * Finish task #8799. 2020-12-24 13:45:45 +08:00
Yagami
f4db6376b2 * Finish task #8812. 2020-12-23 10:28:28 +08:00
leiyong
8089ffe9a6 * Adjust code. 2020-12-18 16:18:41 +08:00
Yagami
66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
Yagami
58faa489a1 * Adjust code. 2020-12-17 11:18:14 +08:00
tianshujie98
6d61bc7129 * Modify the variables of the group module. 2020-12-17 11:00:26 +08:00
Yagami
ae552beafa * Merge sql. 2020-12-16 16:52:37 +08:00
leiyong
200410c2bb * Delete PGMView method. 2020-12-14 23:31:13 +08:00
Yagami
81302ef084 * Finish task #8597. 2020-12-10 15:05:33 +08:00
Yagami
0924720a8f * Merge code. 2020-12-09 15:36:40 +08:00
hufangzhou
fa1e4ef625 * Finish task#8559. 2020-12-01 08:53:38 +08:00
Yagami
1e7021328a * Finish task #8502. 2020-11-27 14:36:46 +08:00
leiyong
1a70a9f311 * Add projectstory module permissions. 2020-11-26 17:52:30 +08:00
holan20180123
4203dcc7ca * Finish task #8497. 2020-11-26 09:32:23 +08:00
z
7328fa8d30 * adjust for merge. 2020-11-24 08:30:29 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
Yagami
310bf2b2c3 * Rename my project and program. 2020-11-20 14:53:33 +08:00
z
5362b9367f * add new version and upgrade. 2020-11-19 11:20:03 +08:00
tianshujie98
f08eaf98a1 * Finish task #8203. 2020-11-12 16:50:03 +08:00
leiyong
adca539b56 * Finish task#8341. 2020-11-12 09:33:43 +08:00
Yagami
227d6c8211 * Adjust code detail. 2020-11-02 14:31:47 +08:00
leiyong
c66f0f9bc5 * Adjustment language files. 2020-11-02 11:48:43 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
leiyong
055d52f45e * Project related products. 2020-10-30 10:55:11 +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
eb845834ef * Adjust language item file. 2020-10-28 15:00:56 +08:00
tianshujie98
a5fac81ec9 * Edit comment. 2020-10-28 10:43:43 +08:00
tianshujie98
7a84c2f826 * Revert commit. 2020-10-28 10:41:55 +08:00
leiyong
0909592ea1 * Adjust whitelist setting logic. 2020-10-28 09:14:38 +08:00
tianshujie98
f56b541129 * Adjust code style. 2020-10-26 15:13:47 +08:00
Yagami
21ba4055ca * Fix bugs and add lang. 2020-10-21 13:24:05 +08:00
tianshujie98
e8b6c85f25 I * Finish task #12794. 2020-10-21 10:47:55 +08:00
Yagami
7772cb6d63 * Add lang and priv. 2020-10-21 09:14:39 +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
leiyong
c400b4b9f3 Merge branch 'master' of github.com:easysoft/zentaopms 2020-10-20 09:09:24 +08:00
leiyong
5dab208c02 * Adding permissions and maintaining language files. 2020-10-20 09:08:45 +08:00
Yagami
a2dded7193 * Add lang. 2020-10-20 09:07:20 +08:00
leiyong
848c61cd96 * Adjustment language files. 2020-10-19 23:15:57 +08:00