Commit Graph
49442 Commits
Author SHA1 Message Date
zhaoke 4446ffdc37 * Fix bug. 2022-12-20 07:19:35 +00:00
zhaoke 6cc59dcf08 Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-20 03:24:45 +00:00
zhaoke b060117c18 * Update log style. 2022-12-20 03:24:37 +00:00
tanghucheng 38a7cfe4df * Fix bug #31051. 2022-12-20 11:18:42 +08:00
zhaoke db6dab44a5 Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-20 02:43:31 +00:00
zhaoke 14ee6a0737 * Fix bug 30988. 2022-12-20 02:43:25 +00:00
tanghucheng d789075902 * Finish task #80388. 2022-12-20 10:36:19 +08:00
tanghucheng f754f0b0e0 * Fix lang file for zahost. 2022-12-20 08:42:48 +08:00
tanghucheng ca4666f7a0 * Fix merge clash. 2022-12-20 08:36:33 +08:00
zhaoke c67f366f89 Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-19 10:57:58 +00:00
zhaoke 57681a20a1 * Finish task 80387. 2022-12-19 10:57:17 +00:00
tanghucheng 6d20a68043 * Finish task #80389. 2022-12-19 16:23:24 +08:00
tanghucheng b77a939f38 * Finish task #80728,80727. 2022-12-19 16:19:26 +08:00
zhaoke ad8160dc7c * Fix bug. 2022-12-17 06:43:50 +00:00
zhaoke 3de1679583 * Fix bug. 2022-12-17 04:10:49 +00:00
zhaoke 121aff11a8 *Fix bug 30983. 2022-12-17 03:44:49 +00:00
zhaoke e3b68db58a Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-17 02:34:52 +00:00
zhaoke 4ac69fb4e6 * Fix bug 30984. 2022-12-17 02:34:40 +00:00
tanghucheng 36a59c5285 Merge branch 'zenops_46_tanghucheng' into zenops_46 2022-12-16 20:21:01 +08:00
tanghucheng 26d746598e * Fix bug for zanode. 2022-12-16 20:20:06 +08:00
tanghucheng 769c65781b * Fix bug #30971. 2022-12-16 19:16:56 +08:00
zhaoke 3c254c96b2 Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-16 11:08:49 +00:00
zhaoke 00a86549b0 Fix bug 30974. 2022-12-16 11:08:45 +00:00
tanghucheng 0d454a3649 * Fix bug #30979. 2022-12-16 17:46:22 +08:00
tanghucheng 227e675339 * Fix bug #30989. 2022-12-16 17:32:49 +08:00
tanghucheng 678f8c813a Merge branch 'zenops_46_tanghucheng' into zenops_46 2022-12-16 16:20:18 +08:00
zhaoke b3948acd66 Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-16 08:18:53 +00:00
zhaoke d6a903ccec * Fix bug 2022-12-16 08:17:23 +00:00
tanghucheng 2749e26670 Merge branch 'zenops_46_tanghucheng' into zenops_46 2022-12-16 15:58:35 +08:00
tanghucheng 3d3d9a3ef4 * Fix bug #30962,30965. 2022-12-16 15:15:42 +08:00
caoyanyi 59801bf729 * Modify blame get error. 2022-12-16 13:36:23 +08:00
tanghucheng 1c3537c8c6 Merge branch 'zenops_46_tanghucheng' into zenops_46 2022-12-16 12:51:32 +08:00
tanghucheng 06061a1b57 * Update testtask runNode. 2022-12-16 12:49:28 +08:00
caoyanyi 000824ef95 * Modify chosen error. 2022-12-16 10:38:52 +08:00
tanghucheng 1078a9f3e7 * Adjust code for run ztf script. 2022-12-16 09:47:06 +08:00
tanghucheng 1505cb89e4 * Fix check autocase for batch run case. 2022-12-16 09:26:09 +08:00
曹延义 149096ed6c * Modify diff page style. 2022-12-16 01:07:18 +00:00
tanghucheng f71dfb3086 * Adjust code function confirmAction for testtask betchRun. 2022-12-15 23:24:52 +08:00
tanghucheng 772c31f7f9 * Adjust code for testtask batchRun. 2022-12-15 23:01:12 +08:00
tanghucheng fabfcb34e4 * Fix issue for zanode. 2022-12-15 21:10:14 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
唐胡成 7c47e59417 Merge branch 'zenops_46_tanghucheng' into 'zenops_46'
Merge branch 'zenops_46_tanghucheng' into zenops_46

See merge request easycorp/zentaopms!6564
2022-12-15 07:24:08 +00:00
tanghucheng dda942dbba Merge branch 'zenops_46' into zenops_46_tanghucheng 2022-12-15 15:20:52 +08:00
孙广明 4acb2e69ec * Fix bug #30658. 2022-12-15 15:17:10 +08:00
王怡栋 6fe7f03e7e Merge branch 'feedback_1576' into 'master'
* Resolve feedback#1576

See merge request easycorp/zentaopms!6530
2022-12-15 06:53:08 +00:00
王怡栋 1fe2f7694c Merge branch 'bugfix/liwenrui/zentaobot' into 'master'
修复禅道机器人相关

See merge request easycorp/zentaopms!6559
2022-12-15 06:52:01 +00:00
Wenrui LI cf3c90d214 * fix unable to get correct execution of task via api, bug #30873. 2022-12-15 14:13:52 +08:00
Wenrui LI a1c0f8d071 * fix default param of zentao bot view task, bug #30865. 2022-12-15 14:13:49 +08:00
孙广明 52ba26c18c * Fix bug #30885. 2022-12-15 14:13:32 +08:00
孙广明 ca6987d98a Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #30800.

See merge request easycorp/zentaopms!6557
2022-12-15 06:04:21 +00:00