Commit Graph
331 Commits
Author SHA1 Message Date
caoyanyi 44a0d56a01 * Fix bug #34753. 2023-04-24 23:30:35 +08:00
liumengyi 19870de8a0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 17:23:44 +08:00
朱金勇 0e619ba796 * Fix bug#34401. 2023-04-19 08:08:11 +00:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
朱金勇 ed55bb7980 * Fix type error. 2023-04-19 02:28:58 +00:00
朱金勇 dbb06251e2 * Fix bug#34330. 2023-04-19 01:10:13 +00:00
liumengyi 8b1a166a1b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-17 14:05:31 +08:00
朱金勇 cd7ec9ee47 * Fix bug#34249. 2023-04-17 05:35:10 +00:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
朱金勇 c7e37cba47 * Fix bug #34136. 2023-04-13 05:15:22 +00:00
liumengyi 2397c644f5 * Finish task #91011. 2023-04-11 15:30:05 +08:00
wangyidong 812f4db7b1 * fix bug for can not select integrated build in create bug. 2023-04-06 16:11:49 +08:00
wangyidong 6ecac70d85 * fix bug #33172. 2023-03-21 15:44:47 +08:00
wangyidong b5127c2bb8 * fix bug #33100. 2023-03-21 13:15:17 +08:00
liumengyi 1c3131e402 * Fix bug #32494. 2023-02-28 08:41:30 +00:00
liuhong f5056eb802 * Adjust code for feedback #2274. 2023-02-21 09:50:19 +00:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
wangyidong c724e74778 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-13 09:46:59 +08:00
wangyidong 11653a8914 * fix bug. 2023-02-13 09:45:43 +08:00
liumengyi d71abe0f43 * Fix bug #32043. 2023-02-10 16:25:49 +08:00
wangyidong de07d90b19 * fix bug #32016. 2023-02-10 11:22:34 +08:00
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