Commit Graph
48427 Commits
Author SHA1 Message Date
wangyuting 2bd28233ea * Fix bug #30429. 2022-12-01 06:28:13 +00:00
wangyidong df0997aa70 * change deletereleased param to noreleased. 2022-11-30 17:11:17 +08:00
王怡栋 c9f918724e Merge branch 'zentaopms266_wyd' into 'master'
* fix bug #29637.

See merge request easycorp/zentaopms!6419
2022-11-30 08:22:39 +00:00
wangyidong 943b177bc0 Merge branch 'zentaopms_266_bug#30341' 2022-11-30 16:22:09 +08:00
wangyidong b2f9f3460b * fix bug #29637. 2022-11-30 16:19:15 +08:00
王 于听 c96f03c532 Merge branch 'master' into 'zentaopms_266_bug#30341'
# Conflicts:
#   module/testtask/control.php
2022-11-30 07:38:45 +00:00
wangyuting 069565c265 * Fix bug. 2022-11-30 07:37:21 +00:00
wangyuting a125f33c4d * Fix bug #30368. 2022-11-30 07:27:01 +00:00
wangyidong eda06bcdc4 * fix bug #29680. 2022-11-30 14:55:45 +08:00
wangyuting 89edb08198 * Fix bug #30341. 2022-11-30 06:41:40 +00:00
wangyidong fb69938202 Merge branch 'zentaopms_266_task_#77615' 2022-11-30 14:11:50 +08:00
王怡栋 2468d5cb60 Merge branch 'master' into 'zentaopms_266_task_#77615'
# Conflicts:
#   module/bug/control.php
2022-11-30 06:11:28 +00:00
王怡栋 49f74f8f77 Merge branch 'zentaopms266_wyd' into 'master'
Zentaopms266 wyd

See merge request easycorp/zentaopms!6416
2022-11-30 06:07:34 +00:00
朱金勇 88dd3e8db3 Merge branch 'change-checksafefile' into 'master'
* If run in container, no need check ok.txt.

See merge request easycorp/zentaopms!6414
2022-11-30 06:05:27 +00:00
wangyidong 8efd793e38 * adjust for getBuildPairs method. 2022-11-30 14:04:32 +08:00
Lufei 35b4ba9e92 * If run in container, no need check ok.txt. 2022-11-30 11:19:31 +08:00
daitingting 2fb8366405 * Finish task #77615,#77616. 2022-11-30 02:49:37 +00:00
wangyidong e10acea921 * fix bug #30212. 2022-11-30 10:07:15 +08:00
王怡栋 c71b65d8b0 Merge branch 'zentaopms_266_task#77610' into 'master'
* Finish task #77610.

See merge request easycorp/zentaopms!6410
2022-11-30 02:06:19 +00:00
王怡栋 aa46a1a6bc Merge branch 'sprint/konglingmao_feedback#508' into 'master'
* Resolved feedback #508, fixed image display error when export to html.

See merge request easycorp/zentaopms!6409
2022-11-30 02:04:50 +00:00
王怡栋 8dde745cbe Merge branch 'master_bug_30061' into 'master'
* Fix bug #30061.

See merge request easycorp/zentaopms!6408
2022-11-30 02:03:29 +00:00
王怡栋 f667a850a1 Merge branch 'sprint/konglingmao_feedback#1514' into 'master'
* Resolved feedback #1514,add execution linkage when project empty.

See merge request easycorp/zentaopms!6389
2022-11-30 02:03:06 +00:00
wangyuting 5c176595e4 * Finish task #77610. 2022-11-30 01:46:45 +00:00
wangyidong 93aa0dd1e9 * fix bug #30274. 2022-11-30 09:37:29 +08:00
孔令茂 1dfe049a97 * Resolved feedback #508, fixed image display error when export to html. 2022-11-30 01:19:51 +00:00
liuhong 68ad91c71b * Fix bug #30061. 2022-11-30 00:53:11 +00:00
朱金勇 9254620aa8 Merge branch 'fix_api_scheme' into 'master'
* Fix baseUrl scheme error for api createDemoData.

See merge request easycorp/zentaopms!6407
2022-11-30 00:20:44 +00:00
孔令茂 e5cfde941d * Optimize project linkage on create bug page. 2022-11-29 13:20:50 +00:00
孔令茂 0b298bf63c * Resolved feedback #1514,add execution linkage when project empty. 2022-11-29 13:20:50 +00:00
朱金勇 e3d103a251 Merge branch 'remove_useless_output' into 'master'
- Remove useless output.

See merge request easycorp/zentaopms!6406
2022-11-29 11:05:19 +00:00
Lufei 12e1539301 * Fix baseUrl scheme error for api createDemoData. 2022-11-29 18:28:13 +08:00
wangyidong c04b6ff12b * change method name getnotemptybuilds to filterlinked. 2022-11-29 17:09:40 +08:00
wangyidong 5f0355999c * adjust for link for de lang. 2022-11-29 16:55:40 +08:00
Lufei cc8254f1a0 - Remove useless output. 2022-11-29 16:46:52 +08:00
王怡栋 77d338052d Merge branch 'zentaopms266_wyd' into 'master'
* code for task #77242.

See merge request easycorp/zentaopms!6405
2022-11-29 08:18:07 +00:00
wangyidong 8d41badb9e * code for task #77242. 2022-11-29 15:50:49 +08:00
王怡栋 f20065e99f Merge branch 'bug_29140' into 'master'
* Fix bug#29140

See merge request easycorp/zentaopms!6401
2022-11-29 06:47:40 +00:00
王怡栋 cdb70c5158 Merge branch 'bug_30309' into 'master'
* Fix bug#30309

See merge request easycorp/zentaopms!6399
2022-11-29 06:47:17 +00:00
王怡栋 6111ca8fae Merge branch 'zentaopms266_wyd' into 'master'
* code for task #77617.

See merge request easycorp/zentaopms!6402
2022-11-29 06:45:38 +00:00
wangyidong 71c1466f5a * code for task #77617. 2022-11-29 14:42:05 +08:00
zenggang b908e942a8 * Fix bug#29140 2022-11-29 06:35:11 +00:00
zenggang 9b63267e10 * Fix bug#30309 2022-11-29 03:01:45 +00:00
wangyidong e460772fc4 * code for task #77129. 2022-11-29 10:52:01 +08:00
王怡栋 1ded7cf032 Merge branch 'sprint/feedback1446' into 'master'
* Fix feedback #1446.

See merge request easycorp/zentaopms!6397
2022-11-29 01:33:39 +00:00
chaideqing db08e26957 * Fix feedback #1446. 2022-11-29 08:48:10 +08:00
王怡栋 7a3a07061e Merge branch 'cyy_repo' into 'master'
* Modify git branh check.

See merge request easycorp/zentaopms!6393
2022-11-28 08:38:14 +00:00
王怡栋 31a54fcc24 Merge branch 'zentaopms_266_task_#77605' into 'master'
* Finish task #77605.

See merge request easycorp/zentaopms!6396
2022-11-28 08:37:57 +00:00
王怡栋 3c8bd022d4 Merge branch 'zentaopms_266_task#77611' into 'master'
* Finish task #77611.

See merge request easycorp/zentaopms!6392
2022-11-28 08:37:00 +00:00
王怡栋 b389198bea Merge branch 'sprint/hufangzhou_feedback_1479' into 'master'
* Handle feedback #1479.

See merge request easycorp/zentaopms!6391
2022-11-28 08:36:37 +00:00
daitingting 7025eeb91e * Finish task #77605. 2022-11-28 08:09:10 +00:00