Commit Graph
2205 Commits
Author SHA1 Message Date
孙广明 575d9e098f Merge branch 'sprint/175_zry_fixbug' into 'master'
Sprint/175 zry fixbug

See merge request easycorp/zentaopms!733
2021-12-02 03:22:23 +00:00
李玉春 c543df8b75 Merge branch 'sprint/174_tianshujie_bug' into 'master'
* Fix the problem of recording product cookies.

See merge request easycorp/zentaopms!719
2021-12-02 03:16:40 +00:00
王怡栋 b043ff0772 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-02 10:55:40 +08:00
王怡栋 bf16167b19 * Support for flow. 2021-12-02 10:55:04 +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
zhengrunyu 0a7b5b0efc * Code for kanban. 2021-12-02 10:10:20 +08:00
xieqiyu fa6b49493f * Fix bug: The problem of execution requirement list module. 2021-12-02 10:06:24 +08:00
王怡栋 f25d797b54 * adjust for flow. 2021-12-02 10:06:02 +08:00
zhengrunyu 79ce6537df * Code for kanban. 2021-12-02 09:53:41 +08: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
xieqiyu 3755502cf5 * Fix bug : Unit test product drop-down error. 2021-12-02 09:12:50 +08:00
tianshujie 00ac35c9db * Delete extra blank lines. 2021-12-02 08:46:01 +08:00
tianshujie be83274876 * Fix the problem of recording product cookies. 2021-12-02 08:43:44 +08:00
xieqiyu 32a526275d * There is a problem with the drop-down of test cases. 2021-12-01 18:14:25 +08:00
xieqiyu 985599a98a * Code for task#45026. 2021-12-01 14:57:53 +08:00
李玉春 686d773f0b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!692
2021-12-01 05:23:47 +00:00
tianshujie 3accd38185 * Remove useless code. 2021-12-01 13:14:06 +08:00
zhujinyong 8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +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
Hao Sun 39a2d7296b * refactor pages with kanban lib. 2021-11-30 14:21:24 +08:00
孙广明 801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +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
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
zhujinyong e86878e5c6 * Fix tree of product and branch. 2021-11-25 14:49:15 +08:00
朱金勇 293a375ec8 Merge branch 'sprint/174_mayue_16605' into 'master'
Fix bug #16605.

See merge request easycorp/zentaopms!616
2021-11-25 06:45:58 +00:00
mayue 1cf28e1120 * Fix bug #16605. 2021-11-25 13:20:54 +08:00
朱金勇 8cdf02366c Merge branch 'sprint/174_hufangzhou_45079' into 'master'
* Add the branch switcher in tree browse page.

See merge request easycorp/zentaopms!614
2021-11-25 05:05:20 +00:00
hufangzhou e431847c58 * Add the branch switcher in tree browse page. 2021-11-25 12:22:56 +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
mayue c40360d556 * Fix bug #16605. 2021-11-25 09:43:34 +08:00
王怡栋 d9ee0bfbf7 Merge branch 'master' into 'sprint/170_package_bug'
# Conflicts:
#   module/mr/model.php
2021-11-25 00:32:52 +00:00
xieqiyu 501e80ddf2 * Fix bug#16606. 2021-11-24 10:03:09 +08:00
zhouxin 2b3df26fd8 Fix bug 16564. 2021-11-23 18:47:56 +08:00
tianshujie 600e4fdbba * Fix bug #16576,16576. 2021-11-23 14:45:20 +08:00
hufangzhou 5ac4cfe9f9 * Code for bug #16559. 2021-11-23 14:13:44 +08:00
王怡栋 c7d94a770e * add lang for mobile api. 2021-11-23 11:21:02 +08:00
hufangzhou c0d4264148 * Fix bug #16564. 2021-11-23 10:10:14 +08:00
王怡栋 74a41448dc * add lang for mobile api. 2021-11-23 09:35:16 +08:00
hufangzhou 984aa6b1e7 * Fix bug #16559. 2021-11-23 09:27:08 +08:00
王怡栋 90a913ca4b Merge branch 'sprint/170' 2021-11-22 16:59:40 +08:00
zhouxin 1f47ec43c9 . 2021-11-22 16:15:37 +08:00