Commit Graph

100 Commits

Author SHA1 Message Date
tanghucheng
9cffc3bcf7 * Fix bug #20754,20776,20759. 2022-03-15 11:13:26 +08:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
xieqiyu
ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
tianshujie
f5e1ceb880 * Finish task #43169. 2021-10-14 09:24:16 +08:00
tianshujie
6ad4f813c4 * Fix bug #14711. 2021-09-08 16:43:25 +08:00
tianshujie98
e99d3664ab * Finish task #41704. 2021-08-23 11:37:26 +08:00
hufangzhou
19533bfb06 * Task #40318: Adjust the code. 2021-07-16 14:08:30 +08:00
qiyu-xie
50a0fc8da2 * Finish task#40318. 2021-07-16 14:03:32 +08:00
zhujinyong
1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
Yagami
f401a0ac06 * Code for task #40118. 2021-07-14 15:55:03 +08:00
holan20180123
41d59a0688 * Fix bug 12627. 2021-06-07 08:15:32 +08:00
holan20180123
fcb0176f3c * Return id when create object by API. 2021-05-12 16:08:50 +08:00
tianshujie98
b0ee3e7ada * Adjust code. 2021-04-29 08:26:38 +08:00
tianshujie98
77ac56be5b * Fix bug #12437. 2021-04-28 15:52:21 +08:00
wangyidong
5e98a02375 * finish task #36745. 2021-03-30 16:41:22 +08:00
zhujinyong
42a46a9e5d * Fix testreport menu. 2021-03-25 10:57:01 +08:00
Yagami
39ae71ddcb * Remove all menugroup. 2021-03-17 13:56:42 +08:00
qiyu-xie
c010c42b08 * Modify group module. 2021-03-04 15:21:01 +08:00
Yagami
294058ddcd * Finish task #36358 and rename mode. 2021-03-02 10:13:51 +08:00
Yagami
a7c118d491 * Code for old/new mode. 2021-02-25 14:42:39 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +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
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
Yagami
a16da916ab * Rename PRJadmin to PRJAdmin. 2020-10-20 14:18:39 +08:00
Yagami
a8b95e3fa7 * Finish task #8110. 2020-10-12 14:52:59 +08:00
Yagami
695aaf5fce * Fix sql error. 2020-10-09 16:34:25 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
Yagami
d117275c5b * Fix group programs. 2020-08-27 13:01:57 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z
bf1912f0d6 * fix bug for get groups with program. 2020-06-23 16:59:41 +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
leiyong
b3b567bc89 * Finish task#7201,task#7189,task#7188,task#7185. 2020-05-10 23:57:42 -07:00
leiyong
c551170d6b * finish task#7112,#7113,#7111. 2020-04-29 02:02:51 -07: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
2f62ecb51e * finish task #6444. 2019-10-12 14:50:00 +08:00
wangyidong
27b5991f94 * fix bug. 2019-05-17 09:33:00 +08:00
yfl
6db8a4e7b2 Merge branch 'master' of https://github.com/easysoft/zentaopms
* Task #5423
2019-05-06 16:33:10 +08:00
liugang
8153dae1bd * Refact manage view page and priv by group page of group. 2018-04-23 17:47:23 +08:00
pengjiangxiu
39186201c4 * Adjust code. 2017-09-21 11:25:37 +08:00
wangyidong
05fc92c45c * adjust for upgrade. 2017-03-23 11:54:55 +08:00
wangyidong
aa6864612c * adjust for construct. 2016-12-02 09:06:58 +08:00
chenfeiCF
ac19e84915 * rm createPrjManageMemberLink method and adjust getDeptUserPairs method. 2016-04-28 17:42:18 +08:00
chenfeiCF
8d843914d4 * finish task #2543.
* adjust method name createGroupLink to createGroupManageMemberLink.
2016-03-25 17:27:08 +08:00
chenfeiCF
6b055c87fe * put getDeptUserPairs method from group model to dept model. 2016-03-13 08:02:35 +08:00
chenfeiCF
7683db7228 * finish task #2459. 2016-02-23 21:46:26 +08:00