zhouxudong
|
fc5f9013e5
|
* Finish task #63580.
|
2022-08-11 08:33:14 +00:00 |
|
zhouxudong
|
04247b0533
|
* Finish task #63580.
|
2022-08-11 07:00:06 +00:00 |
|
zhouxudong
|
40909f0195
|
* Fix bug.
|
2022-08-11 01:28:21 +00:00 |
|
王怡栋
|
de30066a3b
|
Merge branch 'master_liuhong_63787' into 'master'
Master liuhong 63787
See merge request easycorp/zentaopms!4902
|
2022-08-10 08:11:31 +00:00 |
|
xieqiyu
|
0495adaae1
|
* Code for task#63787.
|
2022-08-10 15:54:35 +08:00 |
|
xieqiyu
|
4c01aec006
|
* Code for task#63787.
|
2022-08-10 15:51:23 +08:00 |
|
wangyidong
|
8ca35db2d8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-10 15:29:37 +08:00 |
|
wangyidong
|
901d2b95a0
|
Merge branch 'sprint/master_zhouxudong_code'
|
2022-08-10 15:29:23 +08:00 |
|
mayue
|
0a83b068a0
|
* Fix bug #26252.
|
2022-08-10 15:26:44 +08:00 |
|
zhouxudong
|
c54ef7b6d6
|
* Finish task.
|
2022-08-10 07:24:44 +00:00 |
|
zhouxudong
|
0b570616f1
|
Merge branch 'sprint/master_zhouxudong_code' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_zhouxudong_code
|
2022-08-10 07:21:02 +00:00 |
|
zhouxudong
|
5366bb35b3
|
* Finish task.
|
2022-08-10 07:20:24 +00:00 |
|
王怡栋
|
af7904f9f1
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# module/project/view/create.html.php
|
2022-08-10 07:19:51 +00:00 |
|
xieqiyu
|
bd18594c80
|
* Code for task#63579.
|
2022-08-10 15:09:57 +08:00 |
|
wangyidong
|
36ddb50872
|
Merge branch 'sprint/devplat_31'
|
2022-08-10 14:57:25 +08:00 |
|
wangyidong
|
f55aec696c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-10 14:54:02 +08:00 |
|
wangyidong
|
6db44273d2
|
Merge branch 'sprint224_zg_tasks'
|
2022-08-10 14:51:59 +08:00 |
|
lanzongjun
|
5f34fa4706
|
* fix bug #26159
|
2022-08-10 14:49:20 +08:00 |
|
mayue
|
8f39557d0b
|
* Optimize code.
|
2022-08-10 14:37:17 +08:00 |
|
mayue
|
7a3f67b1e0
|
* Finish task #63796.
|
2022-08-10 14:32:29 +08:00 |
|
wangyuting2
|
964e64efe1
|
* Finish task #63892.
|
2022-08-10 14:14:56 +08:00 |
|
王怡栋
|
48c40b633f
|
Merge branch 'sprint/devplat_31' into 'master'
* Fix bug #26173.
See merge request easycorp/zentaopms!4891
|
2022-08-10 06:02:48 +00:00 |
|
liuruogu
|
64a77e3075
|
* Fix bug #26173.
|
2022-08-10 06:01:37 +00:00 |
|
zenggang
|
858b383916
|
* Adjust code
|
2022-08-10 05:58:04 +00:00 |
|
孙广明
|
5a54c74436
|
Merge branch 'lyk_26065' into 'master'
* Fix bug #26065
See merge request easycorp/zentaopms!4893
|
2022-08-10 05:57:53 +00:00 |
|
孙广明
|
26fe219145
|
Merge branch 'lyk_25249' into 'master'
* Fix bug #25249
See merge request easycorp/zentaopms!4884
|
2022-08-10 05:57:30 +00:00 |
|
xieqiyu
|
2f6d225550
|
* Code for task#62851.
|
2022-08-10 13:55:03 +08:00 |
|
王怡栋
|
338f149887
|
Merge branch 'sprint/224_liumengyi_25319' into 'master'
* Fix bug #25319.
See merge request easycorp/zentaopms!4892
|
2022-08-10 05:53:44 +00:00 |
|
王怡栋
|
99fa671ce8
|
Merge branch 'tanghucheng_task' into 'master'
* Code for port.
See merge request easycorp/zentaopms!4889
|
2022-08-10 05:52:29 +00:00 |
|
王怡栋
|
87889f1498
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of edit execution can change closedDate.
See merge request easycorp/zentaopms!4887
|
2022-08-10 05:51:01 +00:00 |
|
王怡栋
|
53c42e37c5
|
Merge branch 'sprint/224_liumengyi_26109' into 'master'
* Fix bug #26109.
See merge request easycorp/zentaopms!4885
|
2022-08-10 05:50:28 +00:00 |
|
liumengyi
|
880f39ddf0
|
* Fix bug #25319.
|
2022-08-10 13:48:25 +08:00 |
|
liuyongkai
|
e14424eba3
|
* Fix bug #26065
|
2022-08-10 05:46:55 +00:00 |
|
王怡栋
|
026739dc18
|
Merge branch 'master' into 'sprint/224_dongli_bug63669'
# Conflicts:
# module/my/css/task.css
|
2022-08-10 05:46:12 +00:00 |
|
zhouxudong
|
266fdf9ca7
|
* Update code.
|
2022-08-10 05:42:26 +00:00 |
|
liumengyi
|
d80080b67b
|
* Fix bug #25319.
|
2022-08-10 13:39:35 +08:00 |
|
tanghucheng
|
824b9219d9
|
* Code for gantt.
|
2022-08-10 13:34:57 +08:00 |
|
xieqiyu
|
9c4f3f0ee1
|
* Code for task#62851.
|
2022-08-10 13:32:15 +08:00 |
|
tanghucheng
|
3317e70203
|
* Code for port.
|
2022-08-10 13:20:37 +08:00 |
|
liuyongkai
|
0da420f283
|
* Fix bug #26065
|
2022-08-10 05:20:19 +00:00 |
|
liuruogu
|
e05e56ee70
|
* Fix bug #26173.
|
2022-08-10 05:16:15 +00:00 |
|
zenggang
|
7ed3db1651
|
* Adjust code
|
2022-08-10 05:12:23 +00:00 |
|
王怡栋
|
2a2abfe9f0
|
Merge branch 'sprint/224_tianshujie_bug' into 'master'
Sprint/224 tianshujie bug
See merge request easycorp/zentaopms!4890
|
2022-08-10 05:06:59 +00:00 |
|
xieqiyu
|
f8cf3855d2
|
* Code for task#63581.
|
2022-08-10 13:04:40 +08:00 |
|
zenggang
|
b05e056843
|
* Adjust code
|
2022-08-10 04:21:18 +00:00 |
|
liuhong
|
0c2b54ade7
|
*Finish task #63787.
|
2022-08-10 03:57:22 +00:00 |
|
dongli
|
dacb68a745
|
* Fix bug #63669.
|
2022-08-10 03:35:16 +00:00 |
|
xieqiyu
|
72f038d379
|
* Fix bug of edit execution can change closedDate.
|
2022-08-10 11:20:05 +08:00 |
|
zenggang
|
dcacaa5cea
|
* Adjust code
|
2022-08-10 03:09:50 +00:00 |
|
liumengyi
|
986ff8cb6c
|
* Fix bug #26109.
|
2022-08-10 11:09:20 +08:00 |
|