Commit Graph
760 Commits
Author SHA1 Message Date
wangyidong f691ba2918 * code for task #79852,79853. 2022-12-13 15:19:54 +08:00
wangyidong 8dc609e4a0 * code task #79859,79858,79857,79856,79855,79854. 2022-12-13 14:15:39 +08:00
wangyidong d64a93ea2b * code task #79282. 2022-12-09 17:13:06 +08:00
lanzongjun c80e1cfbee Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-09 15:50:05 +08:00
lanzongjun 9158f6f79f * Fix Bug #30616 2022-12-09 15:38:54 +08:00
孙广明 8981507e80 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688

See merge request easycorp/zentaopms!6515
2022-12-09 06:48:13 +00:00
wangyidong f1b27ca35a * fix bug #30745. 2022-12-09 12:23:09 +08:00
lanzongjun dd2160fde3 * Finish Bug #30662 2022-12-09 11:53:58 +08:00
Yagami 7deb827112 * Fix bug #30683. 2022-12-08 14:12:43 +08:00
Yagami c2eb955c56 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-08 13:16:06 +08:00
Yagami fd0b180d71 * Finish task #78676. 2022-12-08 13:15:48 +08:00
wangyidong 3e18aa302a * fix bug #30584. 2022-12-08 09:16:17 +08:00
Yagami d2044980df * Code for release's branch. 2022-12-07 15:29:15 +08:00
孙广明 50bb73fe57 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #78673#78688

See merge request easycorp/zentaopms!6489
2022-12-07 07:01:14 +00:00
Yagami 57dbeba6d9 * Finish task #78672. 2022-12-07 14:45:14 +08:00
lanzongjun 125610f6c5 * Finish Task #78673 2022-12-07 11:23:57 +08:00
wangyidong 8a2cb317c5 * adjust for release story build. 2022-12-07 11:17:00 +08:00
wangyidong e3b57ed1f5 * code task #78915,78916. 2022-12-06 17:59:21 +08:00
wangyidong 90120bd37f * code for task #78914. 2022-12-06 17:42:53 +08:00
wangyidong 2fd85774c1 * code for task #78383. 2022-12-05 08:49:00 +08:00
wangyidong 283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00
王怡栋 2468d5cb60 Merge branch 'master' into 'zentaopms_266_task_#77615'
# Conflicts:
#   module/bug/control.php
2022-11-30 06:11:28 +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
wangyidong e10acea921 * fix bug #30212. 2022-11-30 10:07:15 +08: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
王怡栋 c9bcde900d * fix bug for link multiple builds. 2022-11-25 13:42:42 +08:00
王怡栋 c9c16d1a34 * fix for release product lang. 2022-11-25 13:34:40 +08:00
daitingting 607667bd25 * Adjust codes. 2022-11-24 07:46:53 +00:00
daitingting a6d42f8372 * Check build is integrated. 2022-11-24 06:59:55 +00:00
daitingting f62090ea37 * Fix bug #30076. 2022-11-24 05:56:25 +00:00
王怡栋 fb86a78032 * fix bug #30124. 2022-11-23 10:00:41 +08:00
王怡栋 3de3777bfa * adjust for getBuildPairs. 2022-11-22 17:25:29 +08:00
王怡栋 d09370ba2d * fix bug #30077. 2022-11-22 17:25:29 +08:00
王怡栋 827f04e98a * fix bug #30094. 2022-11-22 15:34:40 +08:00
王怡栋 b996270738 * code for task #77138. 2022-11-22 14:56:48 +08:00
王怡栋 a2d5371030 * code for task #77138,77135,77134,77133,77132,77129. 2022-11-22 13:54:33 +08:00
王怡栋 bac4eeab8b * code for task #77135. 2022-11-22 13:39:28 +08:00
王怡栋 07c1b0cc45 * adjust for create release. 2022-11-18 15:09:21 +08:00
王怡栋 1c0129945c * code for task #76439,76440. 2022-11-18 14:25:24 +08:00
王怡栋 fb9aa7d0dd * code for task #76438. 2022-11-18 10:57:15 +08:00
王怡栋 db540eb67a * code for task #76438. 2022-11-18 10:53:30 +08:00
王怡栋 93a772e01e * fix bug #29834. 2022-11-17 14:01:33 +08:00
王怡栋 2b7f25bc6c * fix bug #29838. 2022-11-17 11:10:17 +08:00
王怡栋 6425496407 Merge branch 'zentaopms261_wyd' 2022-11-17 09:55:27 +08:00
王怡栋 6c0a92fa65 * adjust for sync build to release. 2022-11-17 09:40:51 +08:00
王怡栋 6cc66fad4f Merge branch 'sprint/180beta1_hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!6197
2022-11-16 07:29:23 +00:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00