 朱金勇
|
b775a45b3a
|
Merge branch 'php53' into 'master'
* Compatible PHP5.3.
See merge request easycorp/zentaopms!7007
|
2023-02-21 02:47:14 +00:00 |
|
|
zhujinyong
|
6ae6909717
|
* Fix merge bug.
|
2023-02-21 10:28:55 +08:00 |
|
|
zhujinyong
|
5551177931
|
+ Add error of different type.
|
2023-02-21 10:24:00 +08:00 |
|
|
wangyidong
|
36150659f7
|
* adjst code.
|
2023-02-21 09:35:47 +08:00 |
|
|
Lufei
|
63a8a97c59
|
* Compatible PHP5.3.
|
2023-02-21 09:15:53 +08:00 |
|
|
王怡栋
|
f22e5681af
|
Merge branch 'cyy_bug' into 'master'
* Modify date diff result.
See merge request easycorp/zentaopms!7006
|
2023-02-21 01:06:04 +00:00 |
|
|
Yagami
|
a61a5f99ba
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-21 09:00:03 +08:00 |
|
|
Yagami
|
dc9eb5a1a4
|
* Finish task #85048.
|
2023-02-21 08:59:26 +08:00 |
|
|
caoyanyi
|
f2bd44df29
|
* Modify date diff result.
|
2023-02-21 08:58:32 +08:00 |
|
|
王怡栋
|
1af0838d38
|
Merge branch 'sprint/hufangzhou_bug' into 'master'
* Fix bug for project-execution feature bar active.
See merge request easycorp/zentaopms!7005
|
2023-02-21 00:57:40 +00:00 |
|
|
hufangzhou
|
d4701a82f3
|
* Fix bug for project-execution feature bar active.
|
2023-02-20 09:14:32 +00:00 |
|
|
王怡栋
|
df38f27ead
|
Merge branch 'dev/gfl_theme.css_refactors' into 'master'
Dev/gfl theme.css refactors
See merge request easycorp/zentaopms!7004
|
2023-02-20 08:54:59 +00:00 |
|
|
guofeilong
|
6140c65fcc
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_theme.css_refactors
|
2023-02-20 16:49:32 +08:00 |
|
|
guofeilong
|
9ec918094b
|
* Code for theme css refactors.
|
2023-02-20 16:45:03 +08:00 |
|
|
Hao Sun
|
baa4175164
|
* remove debug code for rendering sparkline
|
2023-02-20 16:32:51 +08:00 |
|
|
Hao Sun
|
5d6c6a8b51
|
* optimize usage of dtable
|
2023-02-20 16:32:17 +08:00 |
|
|
孙广明
|
a2dd5323ca
|
Merge branch 'sprint/hufangzhou_task_85049' into 'master'
* Finish task #85049.
See merge request easycorp/zentaopms!7003
|
2023-02-20 08:26:46 +00:00 |
|
|
王怡栋
|
27bebb66a8
|
Merge branch 'ticket_389' into 'master'
* Resolved feedback 2099
See merge request easycorp/zentaopms!6998
|
2023-02-20 07:25:51 +00:00 |
|
|
hufangzhou
|
2c1995d4a9
|
* Finish task #85049.
|
2023-02-20 07:23:49 +00:00 |
|
|
Yagami
|
b2955aa657
|
* Code for task #85045.
|
2023-02-20 15:11:00 +08:00 |
|
|
孙广明
|
007b13e6ab
|
Merge branch 'sprint/292_liumengyi_sql' into 'master'
* Move sql.
See merge request easycorp/zentaopms!6994
|
2023-02-20 02:35:26 +00:00 |
|
|
孙广明
|
e2ca2cebdf
|
Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug of browse gantt.
See merge request easycorp/zentaopms!6995
|
2023-02-20 02:35:13 +00:00 |
|
|
孙广明
|
de55808bd8
|
Merge branch 'sprint/hufangzhou_task_84583' into 'master'
* Sort the IDs, the child stage comes first, and the parent stage follows.
See merge request easycorp/zentaopms!6996
|
2023-02-20 02:34:57 +00:00 |
|
|
王怡栋
|
f53ae41d59
|
Merge branch 'dev/gfl_add_icon_agileplus_and_waterfallplus' into 'master'
* ZUI: add icon agileplus and waterfallplus.
See merge request easycorp/zentaopms!6997
|
2023-02-20 02:33:35 +00:00 |
|
|
guofeilong
|
911560eeb7
|
* ZUI: add icon agileplus and waterfallplus.
|
2023-02-20 10:28:42 +08:00 |
|
|
liuhong
|
bdac3f1ffa
|
* Resolved feedback 2099
|
2023-02-20 02:27:03 +00:00 |
|
|
Yagami
|
920b129543
|
* Remove projectID in execution path.
|
2023-02-20 10:25:56 +08:00 |
|
|
hufangzhou
|
1849f501fb
|
* Sort the IDs, the child stage comes first, and the parent stage follows.
|
2023-02-20 02:11:04 +00:00 |
|
|
Yagami
|
2dd572fc96
|
* Code for execution-all style.
|
2023-02-20 10:04:43 +08:00 |
|
|
liumengyi
|
6520a56bee
|
* Fix bug of browse gantt.
|
2023-02-20 02:04:33 +00:00 |
|
|
liumengyi
|
3d67146b1a
|
* Move sql.
|
2023-02-20 01:48:54 +00:00 |
|
|
Yagami
|
2c78318298
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-20 09:25:44 +08:00 |
|
|
Yagami
|
cf02e1ad80
|
* Code for execution all list style.
|
2023-02-20 09:25:25 +08:00 |
|
|
wangyidong
|
1a29a5abb9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-20 09:19:33 +08:00 |
|
|
wangyidong
|
cca77bda34
|
Merge branch 'sprint/tsj_task'
|
2023-02-20 09:19:21 +08:00 |
|
|
王怡栋
|
c004967af9
|
Merge branch 'sprint/290_liumengyi_32244' into 'master'
* Fix bug #32244, #32245, #32249, #32251, #32255, #32179, @32167.
See merge request easycorp/zentaopms!6989
|
2023-02-20 01:16:52 +00:00 |
|
|
王怡栋
|
bc4efa791c
|
Merge branch 'sprint/290_liumengyi_84586' into 'master'
* Finish task #84586.
See merge request easycorp/zentaopms!6987
|
2023-02-20 01:15:52 +00:00 |
|
|
王怡栋
|
5d7f729008
|
Merge branch 'sprint/290_liumengyi_fixbug' into 'master'
* Fix bug #32243.
See merge request easycorp/zentaopms!6986
|
2023-02-20 01:15:22 +00:00 |
|
|
tianshujie
|
3962b7a087
|
* Code for finish task #84575.
|
2023-02-20 08:40:32 +08:00 |
|
|
Yagami
|
06220e4f1f
|
* Fix lower php version error.
|
2023-02-20 08:34:19 +08:00 |
|
|
孙广明
|
59dfbd7909
|
Merge branch 'spring/hufangzhou_task_84583' into 'master'
* Code for task #84583.
See merge request easycorp/zentaopms!6992
|
2023-02-19 10:46:34 +00:00 |
|
|
hufangzhou
|
aaeeb9372d
|
* Code for task #84583.
|
2023-02-19 09:17:49 +00:00 |
|
|
孙广明
|
58d20833c7
|
Merge branch 'sprint/hufangzhou_task_84583' into 'master'
* Finish task #84583.
See merge request easycorp/zentaopms!6991
|
2023-02-19 04:03:33 +00:00 |
|
|
hufangzhou
|
75b5b2562c
|
* Finish task #84583.
|
2023-02-18 16:04:53 +00:00 |
|
|
tianshujie
|
b05cad4add
|
* Add case of execution method.
|
2023-02-18 20:16:52 +08:00 |
|
|
tianshujie
|
73077a3615
|
* Code for finish task #84575.
|
2023-02-18 18:55:59 +08:00 |
|
|
tianshujie
|
5aee651454
|
* Code for finish task #84575.
|
2023-02-18 18:39:07 +08:00 |
|
|
liumengyi
|
fb57e0f994
|
* Fix bug #32167.
|
2023-02-18 09:42:58 +00:00 |
|
|
liumengyi
|
09cb859c5e
|
* Fix bug #32179.
|
2023-02-18 09:30:25 +00:00 |
|
|
liumengyi
|
c28161fb0d
|
* Fix bug of create project.
|
2023-02-18 09:15:04 +00:00 |
|