Commit Graph
51524 Commits
Author SHA1 Message Date
caoyanyi 86aa7086c4 * Modify feature bar get. 2023-02-21 11:00:50 +08:00
guofeilong 35569ad22c * Code refactors in module todo lang. 2023-02-21 10:03:34 +08:00
caoyanyi 9924325170 Merge branch 'zentaopms_289' into 289_featureBar 2023-02-21 09:30:34 +08:00
guofeilong b51cb2325f * Code for module tido lang refactors . 2023-02-21 09:26:31 +08:00
caoyanyi 7e038c27d1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-21 09:07:24 +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
caoyanyi 653c393eb1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-21 09:01:07 +08: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
wangyidong a38a99e7b7 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-21 08:49:36 +08:00
wangyidong e88b8e6160 * adjust code. 2023-02-21 08:48:09 +08: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
caoyanyi 37810935a8 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-20 15:44:27 +08:00
caoyanyi 51855da582 * Modify menu tree data. 2023-02-20 15:44:08 +08: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
王怡栋 41832ecc20 Merge branch 'zentaopms_289_gfl' into 'zentaopms_289'
Zentaopms 289 gfl

See merge request easycorp/zentaopms!7002
2023-02-20 07:22:10 +00:00
guofeilong 3fa73c15c1 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289_gfl 2023-02-20 15:16:02 +08:00
guofeilong de9c7e44f4 * Code for js in module langitem . 2023-02-20 15:15:52 +08:00
Yagami b2955aa657 * Code for task #85045. 2023-02-20 15:11:00 +08:00
王怡栋 e1ca736379 Merge branch 'cyy_menu_tree' into 'zentaopms_289'
* Add menu tree.

See merge request easycorp/zentaopms!7001
2023-02-20 06:12:04 +00:00
caoyanyi afe06808da * Add menu tree. 2023-02-20 14:09:25 +08:00
王怡栋 cf704f8b08 Merge branch 'zentaopms_289_gfl' into 'zentaopms_289'
Zentaopms 289 gfl

See merge request easycorp/zentaopms!6999
2023-02-20 05:52:11 +00:00
guofeilong cbf26f0ef1 * Code for langItem module refactors . 2023-02-20 13:46:27 +08:00
guofeilong 684fa3557c * Code refactors in preference.html.php . 2023-02-20 11:16:41 +08:00
guofeilong d229986cff * Code for add js to module dev/langItem . 2023-02-20 11:14:40 +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
guofeilong 6da9c01104 * Code for add js to module/langItem . 2023-02-20 10:00:43 +08: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