Commit Graph
1322 Commits
Author SHA1 Message Date
tianshujie 25d07bb7a9 * Delete unused code. 2021-11-29 17:17:59 +08:00
tianshujie 0c33d76709 * Finish task #45081. 2021-11-29 17:14:01 +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
mayue fea372ea26 * Finish task #44987,44988,44989. 2021-11-29 15:45:56 +08:00
孙广明 8d9fb81d9d Merge branch 'master' into 'sprint/174_hufangzhou_45085'
# Conflicts:
#   module/story/model.php
2021-11-29 07:26:45 +00:00
hufangzhou bf1ca5893e * Modify the url when refresh the tree browse in project module. 2021-11-29 15:20:48 +08:00
孙广明 5ad303eca9 Merge branch 'sprint/174_xieqiyu_45080' into 'master'
Sprint/174 xieqiyu 45080

See merge request easycorp/zentaopms!644
2021-11-29 06:58:17 +00:00
xieqiyu 22e4a664c1 * Code for task#45082. 2021-11-29 13:49:30 +08:00
hufangzhou 0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
xieqiyu 763ae6ea87 * Code for task#45082. 2021-11-28 19:54:47 +08:00
tianshujie 7810fbc629 * Finish task #45081. 2021-11-26 14:59:02 +08:00
王怡栋 03f1dd727e * code for task #45184 and adjust api. 2021-11-26 14:18:28 +08:00
tianshujie 8bf6c34acd * Modify the logic of planning related stories and bugs. 2021-11-26 13:37:15 +08:00
tianshujie 774ee347f5 * Translate modified code. 2021-11-25 17:57:24 +08:00
tianshujie 3816d9a775 * Modify the scope of linked stories and bugs in the plan. 2021-11-25 13:16:20 +08:00
tianshujie 4f4a1f990b * Modify the logic of changing branches in stories. 2021-11-25 11:28:50 +08:00
tianshujie 600e4fdbba * Fix bug #16576,16576. 2021-11-23 14:45:20 +08:00
liyuchun 48909fa19b * Fix bug #16511. 2021-11-22 10:06:49 +08:00
孙广明 7ed253e111 * Finish task #44349. 2021-11-19 11:08:04 +08:00
liyuchun a240c9aa23 * Fix bug #16426,#16393. 2021-11-18 23:17:15 +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
xieqiyu 47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
tianshujie 859327d7a3 * Modify the logic of loading stories when creating use cases in batches. 2021-11-17 14:50:42 +08:00
liyuchun ee073e0530 * Finish task #44366. 2021-11-17 10:44:15 +08:00
liyuchun a5767ccc13 * Finish task #44366. 2021-11-17 09:35:56 +08:00
孙广明 102d718ecf Merge branch 'sprint/170' into 'sprint/170_zhengrunyu_44498'
# Conflicts:
#   module/project/model.php
2021-11-16 05:47:29 +00:00
zhengrunyu d5783e71b3 *Finish task #44498. 2021-11-16 13:43:05 +08:00
zhengrunyu a76ec95e69 *Finish task #44498. 2021-11-16 13:09:51 +08:00
xieqiyu bdb5d1ee01 * Fix bug#16297. 2021-11-15 16:51:12 +08:00
李玉春 8620758bfc Merge branch 'sprint/170_tianshujie_16304' into 'sprint/170'
* Fix bug 16304.

See merge request easycorp/zentaopms!458
2021-11-15 07:54:25 +00:00
tianshujie 4bc73b9223 * Fix bug 16304. 2021-11-15 15:49:00 +08:00
songchenxuan f77166bfb3 * Fix bug #16297 2021-11-15 14:47:13 +08:00
hufangzhou e441e4a28d * Fix the bugs. 2021-11-15 08:50:05 +08:00
liyuchun 06c1daf5fd * Finish task #44216. 2021-11-11 15:12:16 +08:00
liyuchun 5bb53b1000 * Finish task #44216. 2021-11-11 15:02:56 +08:00
李玉春 0c72b041b4 Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.

See merge request easycorp/zentaopms!389
2021-11-11 00:30:32 +00:00
mayue dbfabc47c2 * Finish task #43892. 2021-11-11 08:18:08 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
李玉春 421b19928f Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.

See merge request easycorp/zentaopms!379
2021-11-10 05:03:53 +00:00
mayue 7247a7d4b5 * Finish task #43892. 2021-11-10 11:13:37 +08:00
李玉春 98f519fe31 Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901'
# Conflicts:
#   module/branch/model.php
#   module/story/model.php
2021-11-09 07:53:17 +00:00
tianshujie 8e9dd74c0d * Modify code logic. 2021-11-09 15:47:31 +08:00
tianshujie 5ab6fe77c2 * Modify code logic. 2021-11-09 14:21:17 +08:00
tianshujie 3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08: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
hufangzhou 5d1e3bd65e * Finish task #43904. 2021-11-08 13:14:44 +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