Commit Graph
650 Commits
Author SHA1 Message Date
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
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
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
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
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
hufangzhou d10834ab9f * Code for task #43904. 2021-11-08 18:02:15 +08:00
李玉春 7692460500 Merge branch 'sprint/170_xieqiyu_44028' into 'sprint/170'
Finish task#44028.

See merge request easycorp/zentaopms!327
2021-11-08 06:08:31 +00:00
李玉春 9fe54a903c Merge branch 'sprint/170' into 'sprint/170_hufangzhou_43891_new'
# Conflicts:
#   module/branch/control.php
2021-11-08 05:53:39 +00:00
xieqiyu 866c7adc75 * Code for task#43902. 2021-11-08 13:53:16 +08:00
李玉春 db0c5df00e Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!333
2021-11-08 05:30:29 +00:00
mayue aa116136d0 * Fix bug #15688. 2021-11-08 13:24:23 +08:00
hufangzhou 9732ba073a * Modify the cookie of preBranch type. 2021-11-08 10:19:56 +08:00
tianshujie c5779575c1 * Modify code logic. 2021-11-08 09:29:45 +08:00
xieqiyu acf5b15c06 * Code for task#43902. 2021-11-08 09:20:57 +08:00
hufangzhou d279c5d7d7 * Finish task #43891. 2021-11-05 18:47:39 +08:00
tianshujie 0328182a47 * Modify the logic of the acquisition plan. 2021-11-05 17:19:41 +08:00
tianshujie 77da777064 * Finish task #43893. 2021-11-05 15:46:52 +08:00
孙广明 5812a1e510 Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170'
* Finish task  #43903

See merge request easycorp/zentaopms!319
2021-11-05 03:22:17 +00:00
tianshujie 0e3d64843e * Restore code. 2021-11-05 09:08:25 +08:00
tianshujie 6cb70ab01d * Finish task #43903. 2021-11-05 08:59:55 +08:00
zhouxin 23b7e471d2 Finish task $43876. 2021-11-04 17:16:16 +08:00
hufangzhou 52e49919d2 * Code for bug #15518. 2021-10-14 13:51:59 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
王怡栋 08f1d594c0 * adjust for task #42835. 2021-09-28 09:24:33 +08:00
tianshujie 441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00