Commit Graph
2605 Commits
Author SHA1 Message Date
王怡栋 3ccd9c5c94 Merge branch 'zentaopms_239_task#72259' into 'zentaopms_239'
* Finish task #72259 and bug #28498.

See merge request easycorp/zentaopms!5763
2022-10-17 08:44:38 +00:00
王怡栋 0843863e5d Merge branch 'zentaopms_239_task_#71598' into 'zentaopms_239'
* Finish task #71598, #71599,#71600.

See merge request easycorp/zentaopms!5733
2022-10-17 08:42:51 +00:00
wangyuting2 d1346511be * Finish task #72259 and bug #28498. 2022-10-17 07:37:21 +00:00
liugang 3dc2ee8dd0 * Fix bug #28427. 2022-10-17 11:04:52 +08:00
daitingting 70b252f97c * Finish task #71598, #71599,#71600. 2022-10-11 09:07:57 +00:00
sunguangming f6e2d7d272 * Change project hasproduct to execution hasproduct. 2022-10-11 16:34:49 +08:00
王怡栋 238226a7f0 Merge branch 'zentaopms_239_fix_mutual_test' into 'zentaopms_239'
* Fix bugs of mutual_test.

See merge request easycorp/zentaopms!5720
2022-10-11 08:23:13 +00:00
liugang 657b36b3dc * Hide the link and unlink buttons if the execution is a none-product and single one. 2022-10-11 15:57:02 +08:00
liugang a8ffa986c0 * Fix bug of create default sprint. 2022-10-11 15:25:06 +08:00
sunguangming 587d8285d9 * Fix bug #28389. 2022-10-11 14:54:59 +08:00
daitingting f5d987b55d * Fix bugs of mutual_test. 2022-10-11 05:17:07 +00:00
liugang bedad1aab6 * Fix bug #28391. 2022-10-11 10:22:26 +08:00
liugang d808b28d2e * Hide the plan field on the linkStory page of the execution module. 2022-10-11 10:14:04 +08:00
liugang 3057b55576 * Fix bug #28392. 2022-10-11 10:13:36 +08:00
王怡栋 c943f77c80 Merge branch 'zentaopms_239' into 'zentaopms_239_task#71585'
# Conflicts:
#   module/testtask/model.php
2022-10-10 09:22:39 +00:00
王怡栋 abcdde7ea3 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Fix systemMode bug.

See merge request easycorp/zentaopms!5710
2022-10-10 09:18:50 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liugang f0d3d3e70f * Fix bug #27897. 2022-10-10 14:57:30 +08:00
daitingting f8259297b7 * Finish task #71585,#71586,#71587. 2022-10-10 05:46:31 +00:00
liugang 4512eaf2b4 * Fix bug #27899. 2022-10-10 13:40:04 +08:00
王怡栋 97f4bdac55 Merge branch 'zentaopms_239_task#71580' into 'zentaopms_239'
* Finish task #71580,#71581,#71582,#71583,#71584.

See merge request easycorp/zentaopms!5694
2022-10-10 03:01:48 +00:00
wangyidong 059cf9a8af * code for task #71608. 2022-10-09 17:24:56 +08:00
daitingting 39064a3e22 * Finish task #71580,#71581,#71582,#71583,#71584. 2022-10-09 08:22:27 +00:00
wangyidong 96f993d108 * code for task #71603. 2022-10-09 10:04:38 +08:00
sunguangming 7efbb7d6ca * Fix bug #28227. 2022-10-08 17:02:01 +08:00
liugang 1645dbd263 * Fix bug #27896,27898. 2022-09-30 13:48:12 +08:00
wangyidong acc7774419 * adjust for manage members and products for no multiple project. 2022-09-30 13:23:22 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
王怡栋 846ee00dd2 Merge branch 'master_xieqiyu_27048' into 'master'
* Fix bug#27048.

See merge request easycorp/zentaopms!5626
2022-09-30 00:29:21 +00:00
xieqiyu 100c4359dd * Fix bug#27048. 2022-09-29 08:34:34 +00:00
xieqiyu 45791d127b * Fix bug#27125. 2022-09-29 08:22:59 +00:00
sunguangming 4f58d80d64 * Hide bug plan in waterfall project. 2022-09-29 16:05:03 +08:00
wangyidong 347d7b57c5 * fix bug #28183. 2022-09-29 15:53:16 +08:00
sunguangming 3c17a54dc6 * Code for task #71166. 2022-09-29 13:36:21 +08:00
wangzemei ac72fe5540 * extract common variable for kanban colWidth 2022-09-29 13:24:23 +08:00
wangzemei e38d934cbd * extract common variable for kanban colWidth 2022-09-29 12:20:54 +08:00
sunguangming 595b5f8f83 * Code for task #71167. 2022-09-29 11:36:18 +08:00
曹延义 d972797ed2 * Modify kanban set validate. 2022-09-29 11:23:20 +08:00
wangzemei 769d447a78 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075 2022-09-29 10:52:29 +08:00
曹延义 885121c725 * Modify classic model style. 2022-09-29 10:27:45 +08:00
wangzemei 45ec08b5e1 * add placeholder 2022-09-29 10:26:20 +08:00
wangzemei 7b222116eb * kanban setting: add isset 2022-09-29 09:58:36 +08:00
liugang 010f148222 * Set the team name as same as the execution's name. 2022-09-29 09:20:37 +08:00
曹延义 2160b5efff Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075 2022-09-29 09:18:42 +08:00
wangzemei 363c906500 * add kanban setting input limit 2022-09-28 15:05:40 +08:00
tianshujie 4778db197d * Finish task #70017. 2022-09-28 13:39:06 +08:00
tianshujie 7b2980726e Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 11:59:37 +08:00
李玉春 d401ef9626 Merge branch 'sprint/241_tianshujie_70015' into 'sprint/244'
Sprint/241 tianshujie 70015

See merge request easycorp/zentaopms!5577
2022-09-28 03:25:16 +00:00
wangzemei bcd3d36418 * modify backend logic 2022-09-27 17:10:18 +08:00