Commit Graph

3245 Commits

Author SHA1 Message Date
孙广明
1ea5ad8245 Merge branch 'master_liuhong_78696' into 'master'
Master liuhong 78696

See merge request easycorp/zentaopms!6471
2022-12-07 01:33:32 +00:00
王怡栋
a6ab5060b9 Merge branch 'cyy_optimize' into 'master'
Cyy optimize

See merge request easycorp/zentaopms!6470
2022-12-06 09:31:34 +00:00
liuyongkai
069a8d4a06 * Resolve feedback #1398. 2022-12-06 13:54:54 +08:00
liuhong
a3893c9046 *Adjuct code for task #78696. 2022-12-06 05:11:07 +00:00
caoyanyi
86e46d3e3e * Modify bug create page style. 2022-12-06 11:48:04 +08:00
liuhong
377ba07d06 * Fix task code for #78696. 2022-12-06 03:28:33 +00:00
liuhong
925367c9ca * Adjust code for task #78696. 2022-12-06 02:04:47 +00:00
liuhong
346173fcd9 * Fix task #78696. 2022-12-05 05:57:08 +00:00
daitingting
14ea643f61 * Finish task #78361,#78362. 2022-12-02 08:03:37 +00:00
daitingting
995f927ae6 * Fix bug for task #77615,#77616. 2022-12-01 08:36:46 +00:00
wangyidong
22081a43de * fix bug #30425. 2022-12-01 14:15:35 +08: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
王怡栋
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
王怡栋
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
liuhong
68ad91c71b * Fix bug #30061. 2022-11-30 00:53:11 +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
王怡栋
994015ade9 * fix bug #30229. 2022-11-25 08:34:59 +08:00
lanzongjun
9e55689058 * Fix Task #77265 2022-11-24 16:23:19 +08:00
王怡栋
307629f078 * change nodeletereleased param to withreleased. 2022-11-23 17:23:02 +08:00
孔令茂
e076bcc39f + Resolved feedback #1514, notice error when project required. 2022-11-23 09:12:29 +00:00
xieqiyu
e6e37d4b20 * Fix bug#30032. 2022-11-23 16:17:01 +08:00
zenggang
d76f5da235 * Fix bug#26556 2022-11-23 07:49:01 +00:00
王怡栋
af88ae8739 * fix for show bug openedBuild and reslovedBuild. 2022-11-23 14:05:51 +08:00
zenggang
4609340b65 * Fix bug#29765 2022-11-23 05:09:52 +00:00
王怡栋
3b6b770d72 * fix bug #30068. 2022-11-22 09:45:05 +08:00
wangyuting
8805e4647e * Fix bug #30039. 2022-11-21 06:14:10 +00:00
孙广明
47796aa876 Merge branch 'sprint/zentaopms262_mayue_bug#29684' into 'master'
* Fix bug #29684.

See merge request easycorp/zentaopms!6268
2022-11-21 02:28:08 +00:00
mayue
d0908ccdde * Fix bug #29684. 2022-11-21 10:26:37 +08:00
Yagami
66bc58139f * Finish task #76486. 2022-11-21 10:23:28 +08:00
孙广明
9ec22b0b7d Merge branch 'sprint/zentaopms262_mayue_bug#29687' into 'master'
* Fix bug #29687.

See merge request easycorp/zentaopms!6259
2022-11-18 11:23:39 +00:00
mayue
d264eb022c * Fix bug #29687. 2022-11-18 16:25:18 +08:00
王怡栋
7961c8bc55 Merge branch 'master_feedback_1468' into 'master'
Master feedback 1468

See merge request easycorp/zentaopms!6251
2022-11-18 07:22:01 +00:00
王怡栋
68eb73e7ff Merge branch 'zentaopms_261_bug_#29977' into 'master'
* Fix bug #29977.

See merge request easycorp/zentaopms!6250
2022-11-18 07:21:02 +00:00
王怡栋
1c0129945c * code for task #76439,76440. 2022-11-18 14:25:24 +08:00
daitingting
50975af558 * Fix bug #29977. 2022-11-18 04:02:20 +00:00
liuhong
1b10f6141a * Fix bug foe feedback #1468 2022-11-18 03:10:12 +00:00
liuhong
51f8bf37d6 * Resolved feedback #1468. 2022-11-18 02:06:16 +00: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
王怡栋
0fdbf58dc9 * adjust code. 2022-11-16 17:09:07 +08:00
王怡栋
f4452f6d04 * fix for link story and bug for project release. 2022-11-16 17:06:12 +08:00
王怡栋
cc1300242b Merge branch 'zentaopms_258_bug#29708' into 'master'
* Fix bug #29708.

See merge request easycorp/zentaopms!6182
2022-11-16 03:14:31 +00:00
wangyuting
d6488a7e0f * Fix bug #29708. 2022-11-16 02:29:06 +00:00
王怡栋
5a11d47992 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75921

See merge request easycorp/zentaopms!6176
2022-11-16 02:04:10 +00:00
lanzongjun
2f7e39685c * finish task #75921 2022-11-16 09:34:31 +08:00