Commit Graph
40159 Commits
Author SHA1 Message Date
王怡栋 e259eaea2b Merge branch 'bug_30581' into 'master'
* Fix bug#30581

See merge request easycorp/zentaopms!6487
2022-12-08 00:30:37 +00:00
wangyidong 771dd4c8ed * code for task #78908,78918. 2022-12-07 17:42:41 +08:00
孙广明 bfab34538b Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #78697 Bug #30616#30558

See merge request easycorp/zentaopms!6492
2022-12-07 08:01:02 +00:00
lanzongjun 7189103e60 * Finish Bug #30558 2022-12-07 15:58:31 +08:00
lanzongjun 04cb6a9cac * Finish Bug #30616 2022-12-07 15:53:10 +08:00
Yagami d2044980df * Code for release's branch. 2022-12-07 15:29:15 +08:00
lanzongjun 87e1db0555 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-07 15:21:23 +08:00
lanzongjun 29d8ff292a * Finish Task #78697 2022-12-07 15:17:35 +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 cea279faf1 * Code for task #78672. 2022-12-07 14:49:29 +08:00
Yagami 57dbeba6d9 * Finish task #78672. 2022-12-07 14:45:14 +08:00
lanzongjun 5f3444278b * Finish Task #78688 2022-12-07 14:22:27 +08:00
孙广明 688866a30e Merge branch 'master_xieqiyu_78668' into 'master'
* Finish task#78668.

See merge request easycorp/zentaopms!6488
2022-12-07 05:01:49 +00:00
wangyidong 6ce9128370 * fix bug #30589. 2022-12-07 11:50:17 +08:00
xieqiyu a2d2c55e94 * Code for task#78668. Add trim. 2022-12-07 11:25:41 +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
xieqiyu afe9d49024 * Finish task#78668. 2022-12-07 11:16:55 +08:00
wangyidong 1119afb709 * code for task #78910. 2022-12-07 10:58:26 +08:00
zenggang 88b7894a3f * Fix bug#30581 2022-12-07 02:44:14 +00:00
lanzongjun a0c48aa7c0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-07 10:38:55 +08:00
wangyidong 595ec286b6 * adjust for show build path. 2022-12-07 10:34:10 +08:00
lanzongjun 15d16d3eb6 add default branchName 2022-12-07 09:50:09 +08:00
wangzemei a11b1deeb9 * Optimize the display of radar charts 2022-12-07 09:48:12 +08:00
孙广明 cbb280ba3f Merge branch 'master_xieqiyu_fixbug' into 'master'
* Code for task#78669. Fix bug of edit parent plan.

See merge request easycorp/zentaopms!6480
2022-12-07 01:36:23 +00:00
Yagami 3654cd3c11 Merge branch 'sprint/zentaopms271_lanzongjun' 2022-12-07 09:35:30 +08:00
孙广明 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
lanzongjun e6df8be8a6 add default branch 2022-12-07 09:21:19 +08:00
lanzongjun cb6f17a43e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-07 09:13:19 +08:00
Yagami e5b21b632e * Change execution link stories lang. 2022-12-07 09:10:37 +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
王怡栋 e747ec9232 Merge branch 'feedback_1661' into 'master'
* Resolve feedback#1661

See merge request easycorp/zentaopms!6485
2022-12-06 09:34:14 +00:00
王怡栋 2c0e38cb1c Merge branch 'sprint/hufangzhou_bug_30500' into 'master'
* Fix bug #30500.

See merge request easycorp/zentaopms!6484
2022-12-06 09:33:43 +00:00
王怡栋 142ea2617f Merge branch 'sprint/hufangzhou_ticket_149' into 'master'
* Handle feedback #1666.

See merge request easycorp/zentaopms!6481
2022-12-06 09:32:54 +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
zenggang 4239813b6b * Resolve feedback#1661 2022-12-06 09:30:48 +00:00
wangyidong cb5af075f0 * adjust for upgrade. 2022-12-06 17:27:53 +08:00
lanzongjun a228bfdeeb resolve conflict 2022-12-06 17:21:18 +08:00
hufangzhou 871eb1c0a3 * Fix bug #30500. 2022-12-06 09:20:32 +00:00
lanzongjun 4cbf1397b8 * Finish Task #78671 2022-12-06 17:18:57 +08:00
lanzongjun 55aac8c426 * Finish Task #78664 2022-12-06 16:51:58 +08:00
hufangzhou 70cc4cda66 * Handle feedback #1666. 2022-12-06 08:30:30 +00:00
xieqiyu a4ae40d43b * Code for task#78669. Fix bug of edit parent plan. 2022-12-06 16:22:36 +08:00
孙广明 a1ab91b66b Merge branch 'master_xieqiyu_78667' into 'master'
* Code for task#78667.

See merge request easycorp/zentaopms!6479
2022-12-06 08:09:59 +00:00
孙广明 262e4972b3 Merge branch 'master_xieqiyu_78669' into 'master'
Master xieqiyu 78669

See merge request easycorp/zentaopms!6478
2022-12-06 08:08:45 +00:00
xieqiyu d20421ad39 * Code for task#78667. 2022-12-06 16:06:28 +08:00
孙广明 f06d508e16 * Finish task #78662. 2022-12-06 15:48:09 +08:00
hufangzhou 15d3437046 * Handle ticket #144. 2022-12-06 06:53:34 +00:00
孙广明 20de306b8a Merge branch 'lyk_feedback_1398' into 'master'
* Resolve feedback #1398.

See merge request easycorp/zentaopms!6476
2022-12-06 06:28:06 +00:00