Commit Graph
659 Commits
Author SHA1 Message Date
tianshujie 9e9dcf653d * Modify the code issue. 2021-12-02 15:40:45 +08:00
tianshujie ac0cd01df6 * Fix bug #17043. 2021-12-02 15:35:35 +08:00
李玉春 f2a7e5e302 Merge branch 'sprint/174_tianshujie_16785' into 'master'
* Fix bug #17006,16785.

See merge request easycorp/zentaopms!728
2021-12-02 07:09:05 +00:00
tianshujie 7356cbc76e * Optimize code logic. 2021-12-02 13:23:30 +08: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
tianshujie d33b9ae7e6 * Fix bug #17006,16785. 2021-12-02 10:11:18 +08:00
xieqiyu fa6b49493f * Fix bug: The problem of execution requirement list module. 2021-12-02 10:06:24 +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
tianshujie 3accd38185 * Remove useless code. 2021-12-01 13:14:06 +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
朱金勇 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
王怡栋 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
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
hufangzhou 5ac4cfe9f9 * Code for bug #16559. 2021-11-23 14:13:44 +08:00
hufangzhou c0d4264148 * Fix bug #16564. 2021-11-23 10:10:14 +08:00
hufangzhou 984aa6b1e7 * Fix bug #16559. 2021-11-23 09:27:08 +08:00
xieqiyu 1fe78e5771 * Fix bug#16489. 2021-11-21 00:55:33 +08:00
王怡栋 eb63a17885 * code for task #44313. 2021-11-19 09:08:03 +08:00
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08: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
lizhiqiang 1fb7da9222 *Finish bug #16363. 2021-11-17 16:36:28 +08:00
lizhiqiang 7d2daa9302 * Fix bug 16302 2021-11-17 11:09:55 +08:00
lizhiqiang 2dcd335698 * Fix bug 16302 2021-11-17 11:09:25 +08:00
王怡栋 35cbf3830d * code for task #44309. 2021-11-17 10:36:56 +08:00
王怡栋 ba48e8e38f * code for task #43761. 2021-11-16 17:09:15 +08:00
liyuchun 412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
李玉春 b74f5ab258 Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Fix bug #43916.

See merge request easycorp/zentaopms!465
2021-11-16 03:20:54 +00:00
zhouxin b521b7f6d0 Fix bug. 2021-11-16 11:19:02 +08:00
zhouxin dd5cf8c7bd Fix bug #43916. 2021-11-15 19:15:20 +08:00
王怡栋 dff6726c6b * code for task #44305. 2021-11-15 17:11:12 +08:00
mayue a2f3100ea5 * Modify branch. 2021-11-15 16:18:26 +08:00
tianshujie b175a5057b * Fix bug #16293. 2021-11-15 16:13:51 +08:00
李玉春 a8523d317a Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Finish task #43916.

See merge request easycorp/zentaopms!437
2021-11-15 05:05:00 +00:00
zhouxin b5ab5a03d7 Finish task #43916. 2021-11-15 10:07:01 +08:00
liyuchun 0c7bcaf928 * Fix error of manage product. 2021-11-12 15:07:42 +08:00
zhouxin e57d1d1cc7 Finish task #43916. 2021-11-12 14:06:44 +08:00