Commit Graph
672 Commits
Author SHA1 Message Date
xieqiyu 3755502cf5 * Fix bug : Unit test product drop-down error. 2021-12-02 09:12:50 +08:00
xieqiyu d0afac5593 * Fix bug for batch edit story and bug in project. 2021-11-30 17:10:12 +08:00
李玉春 dbc186a0c4 Merge branch 'master' into 'sprint/174_xieqiyu_45080'
# Conflicts:
#   module/story/control.php
#   module/story/view/header.html.php
#   module/testcase/control.php
2021-11-30 07:44:47 +00:00
xieqiyu 70d8039750 * Add comment. 2021-11-30 15:31:10 +08:00
xieqiyu 888fbfe73b * Code for task#45080. 2021-11-30 15:05:16 +08:00
李玉春 a4426db6f0 Merge branch 'sprint/174_tianshujie_45081' into 'master'
* Fix bug #16939 and modify the scope of the plan when editing bugs.

See merge request easycorp/zentaopms!672
2021-11-30 06:45:48 +00:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
tianshujie 508d7d78bf * Fix bug #16939 and modify the scope of the plan when editing bugs. 2021-11-30 14:14:14 +08:00
songchenxuan 9efa9b1759 * Finish task #45018. 2021-11-30 10:49:38 +08:00
李玉春 a99419f0c5 Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
2021-11-29 08:03:38 +00:00
tianshujie 96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08:00
tianshujie 8bf6c34acd * Modify the logic of planning related stories and bugs. 2021-11-26 13:37:15 +08:00
mayue f92ba845a3 * Fix bug #16605. 2021-11-25 14:35:33 +08:00
mayue 1cf28e1120 * Fix bug #16605. 2021-11-25 13:20:54 +08:00
tianshujie 4f4a1f990b * Modify the logic of changing branches in stories. 2021-11-25 11:28:50 +08:00
tianshujie 1d93fa0cd9 * Modify the scope of the linked plan when creating and editing stories. 2021-11-25 10:30:22 +08:00
hufangzhou 4e2cda3a82 * Fix an error for edit story. 2021-11-24 11:26:43 +08:00
hufangzhou cb78fa20e1 * Modify the nav in edit story. 2021-11-24 10:51:54 +08:00
hufangzhou 7d50d0bb9a Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug 2021-11-24 10:04:55 +08:00
hufangzhou f15477ae01 * Fix an error of modules in product module for batch edit story. 2021-11-24 10:04:52 +08:00
xieqiyu 501e80ddf2 * Fix bug#16606. 2021-11-24 10:03:09 +08:00
hufangzhou 6f4e21aed1 * Code for bug #16578. 2021-11-24 09:38:21 +08:00
zhujinyong 80010bb881 * Adjust batchEdit of story. 2021-11-23 19:46:35 +08:00
hufangzhou fbcc390d81 * Code for bug #16580. 2021-11-23 13:35:03 +08:00
tianshujie 8f1a017225 * Modify the code. 2021-11-22 14:14:17 +08:00
tianshujie 4058eae297 * Change parameters. 2021-11-22 13:52:19 +08:00
tianshujie 69842996d6 * Fix bug #16533. 2021-11-22 13:45:44 +08:00
tianshujie b209b35a3b * Fix bug #16514. 2021-11-22 11:06:08 +08:00
liyuchun 98061fa481 * Fix bug #16513. 2021-11-22 10:15:03 +08:00
liyuchun 83d49cb8d9 * Fix bug #16510. 2021-11-22 10:01:31 +08:00
mayue 90e6d5d315 * Fix bug #16455. 2021-11-19 09:37:32 +08:00
孙广明 6085ad3089 Merge branch 'sprint/170_tianshujie_44496' into 'sprint/170'
*Finish task #44496

See merge request easycorp/zentaopms!511
2021-11-18 06:59:45 +00:00
李玉春 e41ccac2b7 Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
#   module/build/view/create.html.php
#   module/project/model.php
2021-11-18 05:15:10 +00:00
xieqiyu 84340fa6f2 * Code for task#44497. 2021-11-17 22:57:30 +08:00
tianshujie 859327d7a3 * Modify the logic of loading stories when creating use cases in batches. 2021-11-17 14:50:42 +08:00
孙广明 4799784a30 Merge branch 'sprint/172_liyuchun_44370' into 'sprint/168'
Sprint/172 liyuchun 44370

See merge request easycorp/zentaopms!475
2021-11-17 00:51:42 +00:00
liyuchun 412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
songchenxuan f262ca14d1 *Finish task 44492 2021-11-16 15:23:13 +08:00
tianshujie d268587e8d * Finish task #44496. 2021-11-16 15:07:18 +08:00
songchenxuan 1079ebaec1 * Finish task 44492 2021-11-16 14:46:02 +08:00
liyuchun e09374f3b7 * Finish task #44216. 2021-11-16 09:31:52 +08:00
xieqiyu cce14cef80 * Fix bug#16188. 2021-11-14 10:47:12 +08:00
hufangzhou 8352d145f5 * Deal with the branch is empty. 2021-11-12 15:22:47 +08:00
李玉春 fe15f97b82 Merge branch 'sprint/170_mayue_16221' into 'sprint/170'
* Fix bug #16221.

See merge request easycorp/zentaopms!436
2021-11-12 06:00:30 +00:00
mayue 67687a738a * Fix bug #16221. 2021-11-12 13:58:02 +08:00
tianshujie 54d69e1969 * Fix bug #16190. 2021-11-12 13:19:18 +08:00
tianshujie 44bfbb7cdc * Fix bug #16190. 2021-11-12 13:10:52 +08:00
zhujinyong f77b0e6d2d * Check compatibility. 2021-11-11 05:10:38 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
孙广明 521a8e871d * Finish task #44139. 2021-11-09 14:39:07 +08:00