Commit Graph
2470 Commits
Author SHA1 Message Date
tianshujie 90b385d022 * Fix bug #17025. 2021-12-03 08:45:02 +08:00
李玉春 b1cd56f4b3 Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079

See merge request easycorp/zentaopms!715
2021-12-02 02:53:09 +00:00
xieqiyu 3755502cf5 * Fix bug : Unit test product drop-down error. 2021-12-02 09:12:50 +08:00
xieqiyu 985599a98a * Code for task#45026. 2021-12-01 14:57:53 +08:00
tianshujie 2d251fb452 * Fix bug #16801. 2021-12-01 13:37:54 +08:00
hufangzhou c04947228f * Finish task #44992, task #44991, task #44990. 2021-12-01 10:02:46 +08:00
xieqiyu 2fc250b9b2 * Code for task#45079. 2021-12-01 08:15:37 +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
孙广明 801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
李玉春 4b223ec01b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!657
2021-11-30 05:02:41 +00:00
李玉春 0322f02b54 Merge branch 'sprint/174_songchenxuan_45018' into 'master'
* Finish task #45018.

See merge request easycorp/zentaopms!661
2021-11-30 03:19:57 +00:00
孙广明 38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
songchenxuan 9efa9b1759 * Finish task #45018. 2021-11-30 10:49:38 +08:00
hufangzhou 7a5a4d5807 * Rebuild the code. 2021-11-30 10:44:37 +08:00
hufangzhou 4736e3a01c * Solve the problem of mutual testing for task #45085. 2021-11-30 09:59:14 +08:00
xieqiyu 84baf0c896 * Code for task#45080. 2021-11-29 21:28:42 +08:00
tianshujie b51f3c957d * Adjust code of story model. 2021-11-29 17:34:50 +08:00
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
王怡栋 98ab035758 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-29 15:29:26 +08:00
王怡栋 21e42772b2 * add lang for api. 2021-11-29 15:29:00 +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
tianshujie 96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08: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
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 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 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
chaideqing 45556985f7 * refactor ifelse code 2021-11-24 11:22:07 +08:00
hufangzhou cb78fa20e1 * Modify the nav in edit story. 2021-11-24 10:51:54 +08:00
chaideqing 70677f0673 modify zentao bug/task/story card page's srollbar and actionbar 2021-11-24 10:50:51 +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