Commit Graph
29509 Commits
Author SHA1 Message Date
zhujinyong 4b57e8627b * Fix api of program. 2021-11-28 22:17:33 +08:00
李玉春 a9d365b282 Merge branch 'sprint/174_mayue_16640' into 'master'
* Fix bug #16640.

See merge request easycorp/zentaopms!631
2021-11-26 07:24:27 +00:00
mayue ffaaf3ab6e * Fix bug #16640. 2021-11-26 15:23:26 +08:00
李玉春 3c5c265210 Merge branch 'sprint/174_songchenxuan_45050' into 'master'
* Finish task #45050.

See merge request easycorp/zentaopms!630
2021-11-26 07:20:49 +00:00
songchenxuan 5d6909d347 * Finish task #45050. 2021-11-26 15:20:05 +08:00
李玉春 eeb7a4bf6a Merge branch 'sprint/174_songchenxuan_45049' into 'master'
* Finish task #45049.

See merge request easycorp/zentaopms!626
2021-11-26 07:11:50 +00:00
songchenxuan bc13a23d1e * Finish task #45050. 2021-11-26 14:58:39 +08:00
王怡栋 03f1dd727e * code for task #45184 and adjust api. 2021-11-26 14:18:28 +08:00
songchenxuan 35206b32a8 * Finish task #45049. 2021-11-26 14:00:01 +08:00
mayue 0a3c124b20 * Fix bug #16640. 2021-11-26 13:34:17 +08:00
songchenxuan ee53bd1ad2 * Finish task #45049. 2021-11-26 13:33:35 +08:00
王怡栋 d41d6cf262 * adjust for api. 2021-11-26 13:28:45 +08:00
王怡栋 294317ccfe * fix bug for product api. 2021-11-26 11:30:37 +08:00
王怡栋 9b8eea30d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-26 11:26:48 +08:00
王怡栋 1ac64ab4c1 * code for task #44939. 2021-11-26 11:26:27 +08:00
李玉春 6f1784baee Merge branch 'sprint/174_mayue_16603' into 'master'
* Fix bug #16603.

See merge request easycorp/zentaopms!625
2021-11-26 03:18:37 +00:00
mayue b2611b3fb7 * Fix bug #16603. 2021-11-26 10:43:45 +08:00
王怡栋 c15bf759b9 * code for task #44937. 2021-11-26 10:40:54 +08:00
王怡栋 e2503a001c * fix for task view. 2021-11-26 10:19:11 +08:00
王怡栋 73e0f4eaa6 * add bug action fo api. 2021-11-26 09:42:48 +08:00
王怡栋 8b1b0b0da8 * code for task #44955,44954,44953,44952,44951. 2021-11-26 09:37:26 +08:00
王怡栋 2ada8ead0b * code for task #44946. 2021-11-26 09:31:38 +08:00
王怡栋 da513cfd6d * adjust for task #44947. 2021-11-26 08:58:38 +08:00
王怡栋 d188b403d5 * code for task #44958. 2021-11-25 17:28:04 +08:00
王怡栋 01e9096140 * code for task #44946. 2021-11-25 17:00:24 +08:00
王怡栋 396c57f0cb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-25 16:37:46 +08:00
王怡栋 ceded29b95 * code for task #44947,44948,44949,44950,44956. 2021-11-25 16:20:41 +08:00
朱金勇 e372b49a31 Merge branch 'sprint/174_hufangzhou_45085' into 'master'
* Modify the branch switcher in qa menu.

See merge request easycorp/zentaopms!617
2021-11-25 06:59:32 +00:00
hufangzhou 0e67779504 * Modify the branch switcher in qa menu. 2021-11-25 14:53:22 +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 f92ba845a3 * Fix bug #16605. 2021-11-25 14:35:33 +08:00
王怡栋 bcc8081925 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-25 14:23:40 +08:00
王怡栋 39327b4b8f * code for task #44940,44941,44942,44943,44944,44945. 2021-11-25 14:22:26 +08:00
mayue 36afb288d6 * Fix bug #16605. 2021-11-25 13:31:35 +08: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
王怡栋 385cb41a0e * code for task #44938. 2021-11-25 11:35:46 +08:00
zhujinyong 49bff6df49 * Fix router of api. 2021-11-25 10:26:17 +08:00
王怡栋 9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
李玉春 a83f2d8ce9 Merge branch 'sprint/174_mayue_16605' into 'master'
* Fix bug #16605.

See merge request easycorp/zentaopms!613
2021-11-25 01:55:23 +00:00
mayue c2c13a9079 * Fix bug #16605. 2021-11-25 09:53:49 +08:00
mayue c40360d556 * Fix bug #16605. 2021-11-25 09:43:34 +08:00
王怡栋 fb8ff15c2a Merge branch 'sprint/170_package_bug' 2021-11-25 08:34:16 +08:00
王怡栋 d589065650 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-25 08:34:08 +08:00
王怡栋 d9ee0bfbf7 Merge branch 'master' into 'sprint/170_package_bug'
# Conflicts:
#   module/mr/model.php
2021-11-25 00:32:52 +00:00
王怡栋 eec4c536f5 Merge branch 'sprint/170' into 'master'
Sprint/170

See merge request easycorp/zentaopms!611
2021-11-25 00:31:51 +00:00
tianshujie 179e766478 * Modify function name. 2021-11-24 16:45:08 +08:00
王怡栋 57c6ae78a8 * adjust for search. 2021-11-24 14:24:35 +08:00