Commit Graph
3086 Commits
Author SHA1 Message Date
tianshujie deae64dcd1 * Add a prompt for the execution type. 2023-02-22 10:38:25 +08:00
tianshujie 9e7fe8f35d * Code for finish task #85414. 2023-02-22 10:22:29 +08:00
tianshujie 200e97d5b8 * Code for finish task #85414. 2023-02-22 09:55:00 +08:00
hufangzhou 02b8e6f723 * Finish task #85037. 2023-02-21 08:46:43 +00:00
孙广明 a789a412cb 更新module/execution/js/common.js 2023-02-21 07:23:03 +00:00
hufangzhou 10e9d3a6a8 * Fix bug for create execution. 2023-02-21 07:14:49 +00:00
孙广明 e05d8b2eff Merge branch 'sprint/hufangzhou_task_85050' into 'master'
* Finish task #85050.

See merge request easycorp/zentaopms!7012
2023-02-21 05:54:46 +00:00
hufangzhou b997124e9c * Finish task #85050. 2023-02-21 05:52:28 +00:00
hufangzhou dc40747000 * Finish task #85051. 2023-02-21 05:14:28 +00:00
zhujinyong 5551177931 + Add error of different type. 2023-02-21 10:24:00 +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
Yagami b2955aa657 * Code for task #85045. 2023-02-20 15:11:00 +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
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
Yagami 06220e4f1f * Fix lower php version error. 2023-02-20 08:34:19 +08:00
hufangzhou aaeeb9372d * Code for task #84583. 2023-02-19 09:17:49 +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 1eb1f7ad7b * Fix bug of create waterfallplus's execution. 2023-02-18 07:28:22 +00:00
tianshujie 2285275a52 * Remove useless code. 2023-02-18 15:20:29 +08:00
tianshujie 4e7f8247e3 * Code for finish task #84593. 2023-02-18 15:16:29 +08:00
Yagami 1e13b25094 * Code for task #84590. 2023-02-17 15:46:16 +08:00
Yagami 80f3e0e3a0 * Code for batch edit execution error. 2023-02-17 15:30:52 +08:00
wangyidong 9f0f6014d8 * fix bug #32109. 2023-02-17 15:17:06 +08:00
liumengyi 1fb012e889 * Optimize code of bug #32243. 2023-02-17 06:28:43 +00:00
liumengyi 6a9b3fc6e4 * Fix bug #32243. 2023-02-17 06:26:19 +00:00
Yagami fcf56a2c8c * Remove unused code. 2023-02-17 13:52:58 +08:00
liumengyi a0511e7710 * Fix bug of create waterfallplus's execution. 2023-02-17 01:51:06 +00:00
liumengyi 7170af3b44 * Finish task #84586. 2023-02-17 00:52:32 +00:00
Yagami f6dfccc9cd Merge branch 'zentaopms_284' 2023-02-16 17:22:15 +08:00
Yagami af25c582d7 Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 17:07:00 +08:00
Yagami b737d1df40 * Remove unused code. 2023-02-16 17:06:35 +08:00
tianshujie 052d72e4a5 Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 16:18:14 +08:00
tianshujie 5e2ac749af * Fix bug #32233. 2023-02-16 16:17:48 +08:00
Yagami 58fb367739 * Adjust dtable scroll bar and pager z-index. 2023-02-16 16:11:53 +08:00
Yagami 06696bcd0e * Add setCookie for execution export. 2023-02-16 16:05:28 +08:00
zhujinyong 08a6439103 * Expand tree of extensions. 2023-02-16 15:09:35 +08:00
liumengyi 93a890663c * Fix bug of task #84584. 2023-02-16 07:01:13 +00:00
王怡栋 761a7ee0a2 Merge branch 'zentaopms_max4.2_wangyuting' into 'master'
* Fix bug #27133.

See merge request easycorp/zentaopms!6971
2023-02-16 06:44:20 +00:00
tianshujie 951de75b0a Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 14:42:42 +08:00