Commit Graph

874 Commits

Author SHA1 Message Date
hufangzhou
553d78a8b3 * Fix bug #32372, #32373. 2023-02-22 09:05:53 +00:00
zhujinyong
e9ef9029b6 * Code for task #84594. 2023-02-22 11:39:36 +08:00
hufangzhou
02b8e6f723 * Finish task #85037. 2023-02-21 08:46:43 +00:00
hufangzhou
b997124e9c * Finish task #85050. 2023-02-21 05:52:28 +00:00
hufangzhou
1849f501fb * Sort the IDs, the child stage comes first, and the parent stage follows. 2023-02-20 02:11:04 +00: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
hufangzhou
75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00: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
4e7f8247e3 * Code for finish task #84593. 2023-02-18 15:16:29 +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
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
b737d1df40 * Remove unused code. 2023-02-16 17:06: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
tianshujie
ad1d1631a3 * Code for finish task #84593. 2023-02-16 14:42:27 +08:00
liumengyi
7501362a58 * Finish task #84591. 2023-02-16 06:34:10 +00:00
Yagami
38a68912ff Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 13:56:28 +08:00
Yagami
15ff524a7d * Finish task #84590. 2023-02-16 13:56:15 +08:00
liumengyi
cd7cdbb6a8 * Fix bug of task #84592. 2023-02-16 05:35:10 +00:00
tianshujie
484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou
f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
zhujinyong
fd6df950a8 * Only show leaf executions for switcher. 2023-02-15 16:35:39 +08:00
Yagami
da62f994d9 Merge branch 'sgm_dtable' into zentaopms_284 2023-02-15 15:49:53 +08:00
Yagami
f84907df9a * Finish task #83941. 2023-02-15 15:47:20 +08:00
zhujinyong
f1e1580ef7 * Finish task #84596. 2023-02-15 10:25:30 +08:00
tianshujie
2b82314b52 * Fix bug #32145. 2023-02-15 10:08:15 +08:00
liumengyi
7ea51e54b5 * Finish task #84584. 2023-02-14 13:13:46 +08:00
tianshujie
ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
wangyuting2
f51e3c9ffc * Fix bug #27133. 2023-02-10 09:08:29 +08:00
Yagami
c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
liumengyi
84970085ec * Finish task #83942. 2023-02-08 14:14:08 +08:00
hufangzhou
aa909099a4 * Fix sub-stage's attribute bug in execution-edit page. 2023-02-08 13:58:55 +08:00
liumengyi
ed7d5cc4dd * Finish task #83942. 2023-02-07 10:17:09 +08:00
liumengyi
9e353f1064 * Fix bug #31927. 2023-02-06 09:42:08 +08:00
liumengyi
c81a32c8ee * Fix bug #31870, and fix bug of edit execution. 2023-02-02 09:04:10 +08:00
liumengyi
19d8f6ae4d * Fix bug #31856. 2023-02-01 15:25:44 +08:00
liuhong
40ca0b3f77 * Adjust code logic for 30389. 2023-01-31 01:38:33 +00:00
liumengyi
650abbb5f5 * Fix bug of task #83210. 2023-01-30 15:53:48 +08:00
liumengyi
5e179c8b05 * Finish task #83215, #83210. 2023-01-30 15:39:20 +08:00
王怡栋
5ce0bb3c97 Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389 :if delete execution directly the execute is empty.

See merge request easycorp/zentaopms!6793
2023-01-29 08:49:21 +00:00