Commit Graph
873 Commits
Author SHA1 Message Date
王怡栋 5aa2fda450 Merge branch 'zentaopms_266_bug#30429' into 'master'
* Fix bug #30429.

See merge request easycorp/zentaopms!6436
2022-12-01 07:58:03 +00:00
wangyuting 2bd28233ea * Fix bug #30429. 2022-12-01 06:28:13 +00:00
wangyidong 283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00
wangyidong df0997aa70 * change deletereleased param to noreleased. 2022-11-30 17:11:17 +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 89edb08198 * Fix bug #30341. 2022-11-30 06:41:40 +00: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
wangyidong 8efd793e38 * adjust for getBuildPairs method. 2022-11-30 14:04:32 +08:00
daitingting 2fb8366405 * Finish task #77615,#77616. 2022-11-30 02:49:37 +00: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
wangyuting 5c176595e4 * Finish task #77610. 2022-11-30 01:46:45 +00:00
wangyidong c04b6ff12b * change method name getnotemptybuilds to filterlinked. 2022-11-29 17:09:40 +08:00
wangyidong 8d41badb9e * code for task #77242. 2022-11-29 15:50:49 +08:00
wangyidong 71c1466f5a * code for task #77617. 2022-11-29 14:42:05 +08:00
wangyuting fc51e379f0 * Finish task #77611. 2022-11-28 05:22:22 +00:00
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00:00
wangyuting 40ef984250 * Optimize code. 2022-11-25 00:38:38 +00:00
wangyuting c9615e8ad9 * Optimize code. 2022-11-25 00:26:21 +00:00
wangyuting 7417517c05 * Fix bug. 2022-11-24 08:37:31 +00:00
wangyuting 9cbbc919f6 * Fix bug #30130. 2022-11-24 05:45:13 +00:00
王怡栋 cbeb50efbb Merge branch 'zentaopms_263_bug#30033' into 'master'
* Fix bug #30033.

See merge request easycorp/zentaopms!6358
2022-11-24 05:09:30 +00:00
王怡栋 2987e7be7f Merge branch 'zentaopms_263_wangyuting4' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6357
2022-11-24 05:09:04 +00:00
wangyuting 7b531573d9 * Optimize code. 2022-11-24 05:03:27 +00:00
wangyuting 3075732c2b * Fix bug #30033. 2022-11-24 05:01:52 +00:00
wangyuting 7eb8983e96 * Fix bug. 2022-11-24 03:21:12 +00:00
wangyuting 38fc1d6599 * Fix bug #30138. 2022-11-24 00:50:40 +00:00
王怡栋 307629f078 * change nodeletereleased param to withreleased. 2022-11-23 17:23:02 +08:00
王怡栋 105a72f34c * fix bug #30158. 2022-11-23 14:55:44 +08:00
王怡栋 af88ae8739 * fix for show bug openedBuild and reslovedBuild. 2022-11-23 14:05:51 +08:00
王怡栋 65e48a1c49 Merge branch 'zentaopms_263_bug#30141' into 'master'
* Fix bug #30141.

See merge request easycorp/zentaopms!6322
2022-11-23 05:45:20 +00:00
王怡栋 d63eb75150 Merge branch 'zentaopms_263_bug#30130' into 'master'
* Fix bug #30130.

See merge request easycorp/zentaopms!6324
2022-11-23 05:40:47 +00:00
王怡栋 1e4b1f1aec Merge branch 'zentaopms_263_bug#30123' into 'master'
* Fix bug #30123.

See merge request easycorp/zentaopms!6325
2022-11-23 05:40:21 +00:00
wangyuting 887afd1a5c * Fix bug #30123. 2022-11-23 03:18:45 +00:00
wangyuting dcab55d0fd * Fix bug #30130. 2022-11-23 03:15:14 +00:00
王怡栋 d98c9413f0 * fix bug #30074. 2022-11-23 11:09:47 +08:00
wangyuting f977d2d374 * Fix bug #30141. 2022-11-23 03:04:57 +00:00
wangyuting f7225b0170 * Optimize code with review code. 2022-11-23 01:44:59 +00:00
王怡栋 3de3777bfa * adjust for getBuildPairs. 2022-11-22 17:25:29 +08:00
wangyuting 3df06bbb03 * Optimize code. 2022-11-22 08:37:59 +00:00
wangyuting ad77b61dde * Optimize code. 2022-11-22 08:30:08 +00:00
王怡栋 0699b9e061 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 15:07:51 +08:00
王怡栋 b996270738 * code for task #77138. 2022-11-22 14:56:48 +08:00
wangyuting 8c6753ea42 * Finish task #77140. 2022-11-22 06:03:51 +00:00
王怡栋 44caf18a51 Merge branch 'zentaopms_263_task#77130' into 'master'
* Finish task #77130.

See merge request easycorp/zentaopms!6292
2022-11-22 06:01:07 +00:00
王怡栋 3ac62d87a1 * code for task #77138. 2022-11-22 12:07:53 +08:00
wangyuting 5cb3016f3f * Finish task #77130. 2022-11-22 03:01:03 +00:00
王怡栋 e993d07670 * fix bug for show build. 2022-11-21 09:29:19 +08:00
王怡栋 988f80e133 Merge branch 'zentaopms261_wyd' into 'master'
* adjust for create release.

See merge request easycorp/zentaopms!6257
2022-11-18 07:10:55 +00:00