Commit Graph

257 Commits

Author SHA1 Message Date
holan20180123
dc659c6c16 * Fix bug #12194. 2021-04-26 13:03:27 +08:00
holan20180123
796bafb2ca * Fix execution team info error. 2021-04-19 11:43:31 +08:00
leiyong
abd8af87a6 * Fix bug. 2021-04-01 09:57:12 +03:00
leiyong
d935b46f4a * Fix bug. 2021-04-01 09:34:13 +03:00
holan20180123
c80f7b2197 * Fix bug #11051. 2021-04-01 10:57:29 +08:00
tianshujie98
82142502e6 * Fix a bug. 2021-03-30 15:35:24 +08:00
tianshujie98
975090d0e5 * Fix bug #11051. 2021-03-30 15:22:04 +08:00
leiyong
467bfd85b8 * Adjust code. 2021-03-30 10:02:44 +03:00
leiyong
294efb7fc8 * Fix bug. 2021-03-29 09:07:42 +08:00
zhujinyong
4c237e2601 * Fix dynamic logic. 2021-03-24 14:51:28 +08:00
holan20180123
7205b2c240 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-24 13:53:15 +08:00
holan20180123
cea111abed * Adjust session. 2021-03-24 13:53:03 +08:00
leiyong
98d8b82b3f * Adjust code. 2021-03-24 13:18:26 +08:00
Yagami
7f7bfa5578 * Drop no menu module. 2021-03-22 16:21:48 +08:00
Yagami
322bd5dfb7 * Fix browse list session. 2021-03-19 09:35:08 +08:00
Yagami
39ae71ddcb * Remove all menugroup. 2021-03-17 13:56:42 +08:00
Yagami
0149dd2aee * Finish task #36489. 2021-03-12 09:58:32 +08:00
Yagami
d0b8f6164b * Add order by to user view. 2021-03-11 15:24:28 +08:00
holan20180123
0a9d1bb510 * Finish task #36495. 2021-03-10 15:31:39 +08:00
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