Commit Graph
681 Commits
Author SHA1 Message Date
xieqiyu ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
xieqiyu 821fd3644c * Code for task#45536. 2021-12-08 18:48:33 +08:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +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
mayue 07f8a820b0 * Code format #16987. 2021-12-02 09:28:02 +08:00
mayue 63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
mayue c62d599292 * Finish task #44987,44988,44989. 2021-12-01 10:44:38 +08:00
hufangzhou d7110d4ea8 * Code for task #45079. 2021-12-01 08:16:32 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
hufangzhou 4736e3a01c * Solve the problem of mutual testing for task #45085. 2021-11-30 09:59:14 +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 adb2c12935 * Modify the code. 2021-11-29 15:54:48 +08:00
chaideqing 74f7a95902 * optimize zentao buglist/storylist/tasklist show when in xuanxuan card 2021-11-29 14:55:14 +08:00
hufangzhou 0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +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 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
王怡栋 9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
tianshujie 600e4fdbba * Fix bug #16576,16576. 2021-11-23 14:45:20 +08:00
王怡栋 eb63a17885 * code for task #44313. 2021-11-19 09:08:03 +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 47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
李玉春 7442a15c44 Merge branch 'sprint/170_zhouxin_16209' into 'sprint/170'
Fix bug.

See merge request easycorp/zentaopms!480
2021-11-17 05:35:00 +00:00
zhouxin fc3411190c Fix bug 16209. 2021-11-17 13:31:54 +08:00
zhouxin 6b63ed43f2 Fix bug. 2021-11-17 10:44:19 +08:00
mayue 0dd5dd1955 * Finish task #44493,44494. 2021-11-17 10:27:02 +08:00
mayue 8b8c4fe180 * Finish task #44493,44494. 2021-11-17 09:30:34 +08:00
tianshujie fdade49b5d * Fix the creation and editing of stories and bugs. 2021-11-17 09:21:05 +08:00
mayue 102561019d * Finish task #44493,44494. 2021-11-16 18:20:35 +08:00
mayue 7d496eebc2 * Finish task #44493,44494. 2021-11-16 17:05:03 +08:00
liyuchun 9362f0941a * Adjust code for task #44730. 2021-11-16 16:30:41 +08:00
liyuchun 412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
李玉春 ba6a2cd512 Merge branch 'sprint/170_zhouxin_16209' into 'sprint/170'
Fix bug #16209.

See merge request easycorp/zentaopms!452
2021-11-15 05:23:45 +00:00
zhouxin ccb98adb41 Fix bug #16209. 2021-11-15 10:44:29 +08:00
hufangzhou 8352d145f5 * Deal with the branch is empty. 2021-11-12 15:22:47 +08:00
hufangzhou bf08427c9a * Modify the cookie of storyModule. 2021-11-12 09:45:43 +08:00
李玉春 00abaf7745 Merge branch 'sprint/170_tianshujie_16192' into 'sprint/170'
* Fix bug #16192.

See merge request easycorp/zentaopms!415
2021-11-11 08:33:28 +00:00
tianshujie 93c8bb6ba8 * Modify the judgment logic. 2021-11-11 16:32:29 +08:00
李玉春 2ff4571f77 Merge branch 'sprint/170_hufangzhou_16169' into 'sprint/170'
* Fix bug #16169, bug#16179.

See merge request easycorp/zentaopms!412
2021-11-11 08:32:14 +00:00
李玉春 c8b1eaef62 Merge branch 'sprint/170_mayue_16191' into 'sprint/170'
* Fix bug #16191.

See merge request easycorp/zentaopms!414
2021-11-11 08:19:38 +00:00
tianshujie 78aee66c47 * Fix bug #16192. 2021-11-11 16:18:54 +08:00
mayue f8eebdf678 * Fix bug #16191. 2021-11-11 16:08:03 +08:00
tianshujie fd9423c737 * Remove useless code. 2021-11-11 15:42:42 +08:00
hufangzhou 4163d17335 * Fix bug #16169, bug#16179. 2021-11-11 15:31:37 +08:00
tianshujie 2eb1a00881 * Fix bug #16190. 2021-11-11 15:25:29 +08:00
tianshujie 4f4b683dbd * Fix bug #16190. 2021-11-11 15:20:01 +08:00
李玉春 a02ebf672e Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.

See merge request easycorp/zentaopms!410
2021-11-11 06:49:40 +00:00
mayue dfa82c09db * Finish task #43892. 2021-11-11 14:48:02 +08:00