Commit Graph
4230 Commits
Author SHA1 Message Date
daitingting 90701e792b * Finish task #71573. 2022-10-20 07:53:20 +00:00
tianshujie f107a95ba2 * Fix bug #28706. 2022-10-20 10:55:31 +08:00
tianshujie 17ef65813e * Modify Kanban Settings page style issues. 2022-10-20 10:37:07 +08:00
daitingting 6750bed454 * Finish task #71572. 2022-10-20 01:41:01 +00:00
王怡栋 5bed328848 Merge branch 'master_feedback_1133' into 'master'
* Adjust code format.

See merge request easycorp/zentaopms!5815
2022-10-20 00:30:53 +00:00
liuhong f756b892d6 * Adjust code format. 2022-10-19 12:53:54 +00:00
Yagami b4bdcd0ca3 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-10-19 15:36:28 +08:00
Yagami 187d3b8ca4 * Finish task #72674. 2022-10-19 15:36:15 +08:00
tianshujie 80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
liuhong a7765cfae8 * Adjust the code format. 2022-10-19 06:13:35 +00:00
wangyuting2 5182cf2d42 * Finish task #72775. 2022-10-19 05:20:12 +00:00
liuhong db48df1bb5 *Fix feedback #1133 for waterfall project choose stagefilteri with Related pages. 2022-10-19 05:09:01 +00:00
Yagami c330b6bc06 * Finish task #72673. 2022-10-19 13:07:04 +08:00
Yagami 33bb2e6082 * Finish task #72672. 2022-10-19 10:47:30 +08:00
Yagami 6788ef5793 * Finish task #72671. 2022-10-19 09:23:59 +08:00
Yagami b99203caa6 * Finish task #72678. 2022-10-18 11:23:12 +08:00
李玉春 bb90adf795 Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug

See merge request easycorp/zentaopms!5759
2022-10-17 09:24:39 +00:00
王怡栋 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
tianshujie 4245745bec * Finish task #72351. 2022-10-17 16:31:40 +08:00
wangyuting2 d1346511be * Finish task #72259 and bug #28498. 2022-10-17 07:37:21 +00:00
tianshujie 80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
liugang 3dc2ee8dd0 * Fix bug #28427. 2022-10-17 11:04:52 +08:00
wangzemei 478bbcc87c * Fix bug #28447 2022-10-14 17:21:37 +08:00
王怡栋 af516229bb Merge branch 'bug_28518' into 'master'
* Fix bug#28518

See merge request easycorp/zentaopms!5749
2022-10-14 04:17:35 +00:00
王怡栋 edf6de9fe9 Merge branch 'sprint/gfl_28499' into 'master'
* fix bug * 28499

See merge request easycorp/zentaopms!5741
2022-10-14 00:39:49 +00:00
zenggang c7086c8d77 * Fix bug#28518 2022-10-13 07:50:54 +00:00
guofeilong c46cf29a2c * fix bug * 28499 2022-10-12 07:52:09 +00:00
daitingting 70b252f97c * Finish task #71598, #71599,#71600. 2022-10-11 09:07:57 +00:00
wangzemei 01a12c95d9 * fix bug #283950 2022-10-11 16:42:59 +08: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
tianshujie 0b49c19866 * Fix bug #28451. 2022-10-11 14:53:01 +08:00
李玉春 bd488328ab Merge branch 'sprint/gfl_71875' into 'master'
* finish task 71875

See merge request easycorp/zentaopms!5716
2022-10-11 06:52:12 +00:00
李玉春 30238c658f Merge branch 'sprint/247_tianshujie_71888' into 'master'
Sprint/247 tianshujie 71888

See merge request easycorp/zentaopms!5723
2022-10-11 06:51:55 +00:00
wangzemei 740e144707 * fix bug 28388 && 28395 2022-10-11 14:05:33 +08:00
tianshujie 202be34c31 * Finish task #71888. 2022-10-11 13:50:58 +08:00
daitingting f5d987b55d * Fix bugs of mutual_test. 2022-10-11 05:17:07 +00:00
wangzemei b14dd4c6ed * fix 28426 2022-10-11 12:11:22 +08: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
曹延义 8f73e4d340 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gfl_71875 2022-10-11 08:36:05 +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
guofeilong 3d563b958b * finish task 71875 2022-10-10 09:21:54 +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
李玉春 923718371a Merge branch 'sprint/cyy_71903' into 'master'
* Finish task #71903.

See merge request easycorp/zentaopms!5707
2022-10-10 08:44:41 +00:00