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 |
|
wangyidong
|
015401d1e0
|
* change zpl 1.1 to 1.2.
|
2015-11-05 14:09:52 +08:00 |
|
wangyidong
|
5d799fba83
|
* adjust code for group view.
|
2015-08-06 14:33:15 +08:00 |
|
wangyidong
|
729b2a2e0f
|
* adjust for manage view.
|
2015-05-20 10:16:10 +08:00 |
|
wangyidong
|
36a4c32720
|
* finish task #2241,2245.
|
2015-05-08 09:47:39 +08:00 |
|
wangyidong
|
93ed6c90f8
|
* fix bug #672.
|
2015-01-29 10:12:22 +08:00 |
|
wangyidong
|
0dd2d53f40
|
* change for task #2190.
|
2015-01-28 15:14:02 +08:00 |
|
Catouse
|
87cf62ca03
|
* ajusted layout of 'story/review'.
* added location param to the function 'closeModal' in my.js and front.class.php.
|
2014-04-28 15:27:08 +08:00 |
|
azhi
|
68682101b5
|
* finish task#1645.
|
2013-08-01 16:52:24 +08:00 |
|
xia0ta0
|
b6b4010892
|
* code for task#1657.
|
2013-08-01 10:44:08 +08:00 |
|
wyd621
|
ec50ddf69d
|
* commit for different.
|
2013-07-17 10:05:00 +08:00 |
|
chencongzhi520@gmail.com
|
dd383e1a65
|
* finish task#1271.
* code for task@1323.
|
2013-04-15 02:45:49 +00:00 |
|
wangyidong
|
f595d7b95d
|
* finish task #1073.
|
2013-02-19 00:36:09 +00:00 |
|
wangchunsheng
|
a0d15a199c
|
* adjust the title assign method.
|
2013-01-20 08:11:33 +00:00 |
|
wangchunsheng
|
8f0d651d9c
|
* convert to unix format.
|
2013-01-18 01:58:14 +00:00 |
|
wangchunsheng
|
48d43cb5e1
|
* change copyright time.
|
2013-01-18 01:18:58 +00:00 |
|
wangyidong
|
2dd1aa2f2d
|
* finish task #1059.
|
2013-01-07 08:39:27 +00:00 |
|
wangyidong
|
833f89610d
|
* fix a bug for group byModule.
|
2013-01-07 03:16:43 +00:00 |
|
wangyidong
|
0c1b21dd4d
|
* adjust for task #1045.
|
2013-01-06 07:09:21 +00:00 |
|
zhujinyong
|
7b06b0811a
|
* code for task#936.
|
2012-12-13 06:13:02 +00:00 |
|
wangchunsheng
|
41cf62ef77
|
* fix the bug#344.
|
2012-09-01 06:20:31 +00:00 |
|