Commit Graph

238 Commits

Author SHA1 Message Date
qiyu-xie
8eef5aa4e8 * Modify user module bug. 2021-03-05 11:29:37 +08:00
qiyu-xie
993d852d2e * Modify user module. 2021-03-05 08:58:06 +08:00
holan20180123
80b1c44d4a Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-19 15:24:07 +08:00
holan20180123
1e7beb09af * Finish task #36018. 2021-02-19 15:23:32 +08:00
wangyidong
6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
holan20180123
abec7b041b * Fix bug #10950. 2021-02-05 16:57:01 +08:00
holan20180123
8c50f17c84 * Fix bug #10950. 2021-02-05 14:15:10 +08:00
holan20180123
d74361b03a * Finish task #9097. 2021-01-29 16:01:03 +08:00
holan20180123
608b1795f5 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-29 15:24:46 +08:00
holan20180123
0611a739fe * Finish task #9118. 2021-01-29 15:24:30 +08:00
leiyong
60cce4dbc8 * Adjust code. 2021-01-29 15:17:15 +08:00
wangyidong
e5b0134b22 * finish task #9114. 2021-01-29 14:27:32 +08:00
holan20180123
c26a63e7fb * Finish task #9118. 2021-01-28 14:46:12 +08:00
qiyu-xie
e9d2711275 * Finish task#9094. 2021-01-27 11:23:48 +08:00
holan20180123
80771fe247 * Finish task #9086. 2021-01-26 16:24:15 +08:00
holan20180123
05e01bf850 * Finish task #9091. 2021-01-26 14:28:22 +08:00
holan20180123
68d4f91e9a * Finish task #9002. 2021-01-21 11:03:51 +08:00
leiyong
5afc6c990a * Fix bug. 2021-01-19 13:53:51 +08:00
holan20180123
e6a9fec35c * Finish task #9043. 2021-01-19 10:12:59 +08:00
Yagami
23f1c4b024 * Code for task #5688. 2021-01-18 17:29:36 +08:00
holan20180123
4428e6443c * Finish task #9002. 2021-01-15 10:13:27 +08:00
holan20180123
88043e53b3 * Finish task #9002. 2021-01-14 17:25:18 +08:00
holan20180123
c9f0612924 * Finish task #9002. 2021-01-13 15:04:11 +08:00
wangyidong
16c921432d * finish task #8682. 2020-12-16 17:41:35 +08:00
wangyidong
5866f61a86 * Merge from master. 2020-12-16 17:36:51 +08:00
wangyidong
c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
wangyidong
ff9a3932cc * adjust for check one click package. 2020-12-09 10:53:04 +08:00
wangyidong
8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
z
3e902392ac * search with account. 2020-11-20 13:09:02 +08:00
qiyu-xie
3d85fc9346 * Finish task#8423. 2020-11-17 16:58:46 +08:00
guanxiying
7f1029c349 * Add usermodel::login function 2020-11-02 16:31:10 +08:00
Yagami
2fe5ec9993 * Program/project edit page change acl. 2020-10-19 13:56:46 +08:00
holan20180123
1aca528db1 * Finish task #7917. 2020-09-17 16:20:04 +08:00
holan20180123
0a438c628d * Finish task #7917. 2020-09-17 16:16:25 +08:00
holan20180123
e590c140b3 * Finish task #7917. 2020-09-17 15:58:09 +08:00
holan20180123
1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z
4acf8e3990 * finish task #7603,7603. 2020-08-07 15:14:20 +08:00
tianshujie98
a99aab00ea *Finish task #7587. 2020-08-05 17:04:47 +08:00
z
a748df7c3c * code for task #7600. 2020-08-04 14:05:41 +08:00
z
d8ce393afa * finish task #7264. 2020-06-17 10:48:37 +08:00
z
5eca2a6ca7 * adjust for change locate page when login. 2020-06-16 10:45:19 +08:00
sgm0422
5c5ef4eb0c * Fix acl and rights. 2020-06-12 16:41:40 +08:00
wangyidong
2a0b9d3f43 * finish task #7066. 2020-05-09 08:23:34 +08:00
leiyong
c551170d6b * finish task#7112,#7113,#7111. 2020-04-29 02:02:51 -07:00
guanxiying
bad6bbd39c * Add httpOnly param when setcooki. 2019-11-21 14:20:11 +08:00
Yagami
24ca9fbc01 * Finish task #6542. 2019-11-20 10:00:56 +08:00
Yagami
1038f2a069 * Fix delete template bug. 2019-10-14 09:04:52 +08:00
wangyidong
da2a9751dc * finish task #6447. 2019-10-12 10:28:02 +08:00