Commit Graph
310 Commits
Author SHA1 Message Date
lanzongjun b4dd6cb307 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-15 13:54:20 +08:00
lanzongjun 057bfe77e2 * Finish Task #79453 2022-12-15 10:55:08 +08:00
xieqiyu fc17dfc949 * Code for task#79662. 2022-12-14 14:10:49 +08:00
孙广明 2fdb547f3e Merge branch 'master' into 'master_271_78665'
# Conflicts:
#   module/build/control.php
2022-12-09 08:58:55 +00:00
孙广明 a7d7ec312a Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30616

See merge request easycorp/zentaopms!6522
2022-12-09 08:55:12 +00:00
wangyidong 81d3403a20 * code for task #79279. 2022-12-09 16:54:17 +08:00
lanzongjun e6301a8ec3 * Fix Bug #30616 2022-12-09 16:03:32 +08:00
lanzongjun dd2160fde3 * Finish Bug #30662 2022-12-09 11:53:58 +08:00
lanzongjun c73d589b54 * Finish Bug #30664 2022-12-08 16:28:38 +08:00
lanzongjun e9bc72f2b2 * Finish Bug #30689 2022-12-08 15:56:30 +08:00
lanzongjun 1b4791f74b * Fix build create 2022-12-08 15:45:36 +08:00
liuhong 8ad99f03a5 * Adjuct code #78665. 2022-12-08 04:24:10 +00:00
wangyidong e4b9ef4536 * fix bug #30585. 2022-12-08 09:56:31 +08:00
liuhong ec810545d5 * draft code for #78665. 2022-12-08 00:19:26 +00:00
xieqiyu afe9d49024 * Finish task#78668. 2022-12-07 11:16:55 +08:00
lanzongjun a228bfdeeb resolve conflict 2022-12-06 17:21:18 +08:00
lanzongjun 55aac8c426 * Finish Task #78664 2022-12-06 16:51:58 +08:00
wangyidong 0f1de8b84f * code for task #78911 2022-12-06 13:43:17 +08:00
lanzongjun 9746936437 * Finish Task #78664 2022-12-05 16:22:32 +08:00
daitingting 14ea643f61 * Finish task #78361,#78362. 2022-12-02 08:03:37 +00:00
王怡栋 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 89edb08198 * Fix bug #30341. 2022-11-30 06:41:40 +00:00
wangyidong 8efd793e38 * adjust for getBuildPairs method. 2022-11-30 14:04:32 +08:00
wangyidong c04b6ff12b * change method name getnotemptybuilds to filterlinked. 2022-11-29 17:09:40 +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 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 7eb8983e96 * Fix bug. 2022-11-24 03:21:12 +00:00
王怡栋 307629f078 * change nodeletereleased param to withreleased. 2022-11-23 17:23:02 +08:00
王怡栋 af88ae8739 * fix for show bug openedBuild and reslovedBuild. 2022-11-23 14:05:51 +08: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
王怡栋 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 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
王怡栋 07c1b0cc45 * adjust for create release. 2022-11-18 15:09:21 +08:00
王怡栋 8aeb743c8f Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd

See merge request easycorp/zentaopms!6255
2022-11-18 06:42:59 +00:00
王怡栋 1c0129945c * code for task #76439,76440. 2022-11-18 14:25:24 +08:00
王怡栋 db540eb67a * code for task #76438. 2022-11-18 10:53:30 +08:00
王怡栋 e4c02e2857 Merge branch 'zentaopms_258_task#76435' into 'master'
* Finish task #76435、76436、76437.

See merge request easycorp/zentaopms!6234
2022-11-17 08:47:30 +00:00
wangyuting 97073567df * Finish task #76435、76436、76437. 2022-11-17 08:42:31 +00:00