Commit Graph
1196 Commits
Author SHA1 Message Date
王怡栋 b475712690 * code for task #44322. 2021-11-19 09:41:18 +08:00
mayue 039784e212 * Fix code error. 2021-11-18 15:24:15 +08:00
李玉春 bf47fb620b Merge branch 'sprint/170' into 'sprint/170_mayue_16364'
# Conflicts:
#   module/project/control.php
2021-11-18 07:09:28 +00:00
mayue c26fb97685 * Fix bug #16364. 2021-11-18 15:07:42 +08:00
mayue 49b3b22630 * Fix bug #16364. 2021-11-18 14:48:05 +08:00
李玉春 3870f6f9e4 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.

See merge request easycorp/zentaopms!495
2021-11-18 06:30:03 +00:00
mayue 03620d8454 * Fix bug #16364. 2021-11-18 14:24:29 +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 292b09bb28 * Delete unused code. 2021-11-17 23:23:00 +08:00
xieqiyu 47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
songchenxuan 1578acc86d * Fix bug 15828 2021-11-16 17:37:30 +08:00
songchenxuan fe5c7a762e * Fix bug 15828 2021-11-16 17:30:56 +08:00
songchenxuan 626ff953ca * Fix bug 15828 2021-11-16 16:47:00 +08:00
songchenxuan 515221aa5d *Fix bug #15828 2021-11-16 16:03:37 +08:00
mayue a2f3100ea5 * Modify branch. 2021-11-15 16:18:26 +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
李玉春 dbf8840697 Merge branch 'sprint/170_mayue_16223' into 'sprint/170'
* Fix bug #16223.

See merge request easycorp/zentaopms!449
2021-11-15 01:40:34 +00:00
mayue 3921075895 * Fix bug #16223. 2021-11-12 17:55:58 +08:00
tianshujie bc2560fd95 * Remove spaces. 2021-11-12 15:36:29 +08:00
tianshujie a3da8bf0e0 * Merge conflict. 2021-11-12 15:33:35 +08:00
李玉春 9686f7e13e Merge branch 'sprint/170' into 'sprint/170_tianshujie_16194'
# Conflicts:
#   module/project/control.php
2021-11-12 07:31:40 +00:00
liyuchun 0c7bcaf928 * Fix error of manage product. 2021-11-12 15:07:42 +08:00
tianshujie 50b4590655 * Fix bug #16194. 2021-11-12 14:53:51 +08:00
zhouxin e57d1d1cc7 Finish task #43916. 2021-11-12 14:06:44 +08:00
孙广明 a075c72531 * Fix execution update order. 2021-11-12 09:28:37 +08:00
tianshujie fe99d1fafb * Finish task #43901. 2021-11-09 19:56:48 +08:00
tianshujie 8e9dd74c0d * Modify code logic. 2021-11-09 15:47:31 +08:00
tianshujie 5ab6fe77c2 * Modify code logic. 2021-11-09 14:21:17 +08:00
tianshujie eedcc1aed5 * Modify code logic. 2021-11-09 10:28:16 +08:00
tianshujie 3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
孙广明 2fb46989d3 * Code for task #43997. 2021-11-08 13:15:56 +08:00
zhengrunyu 79e7052af0 *Finish task #43915. 2021-11-03 17:23:38 +08:00
zhengrunyu 6a20c5b9b9 *Finish task #43915. 2021-11-03 17:16:46 +08:00
hufangzhou 52e49919d2 * Code for bug #15518. 2021-10-14 13:51:59 +08:00
hufangzhou 1e173e756d * Fix bug #15498. 2021-10-13 16:15:57 +08:00
tianshujie 441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
zhujinyong 798c0b202c * Fix GET builds and projects of API. 2021-09-10 10:14:22 +08:00
xieqiyu 27a1652e0e * Fix bug#14951. 2021-09-09 08:52:12 +08:00
王怡栋 4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
xieqiyu 104c1e8548 * Code for task#41781. 2021-08-31 16:25:44 +08:00
xieqiyu 34b5a56105 * Code for task#41776. 2021-08-31 10:14:12 +08:00
tianshujie f459105129 * Modify dynamic back link problem. 2021-08-31 09:12:58 +08:00
zhujinyong 664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
tianshujie 5f740be96b * Modify the test case back link problem. 2021-08-27 15:24:32 +08:00
xieqiyu 81781c80f0 * Code for task#41776. 2021-08-26 18:32:51 +08:00
王怡栋 6b275b3487 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-25 20:10:51 +08:00
王怡栋 4500687de6 * finish task #41923. 2021-08-25 20:10:03 +08:00
xieqiyu 5b8e78cd18 * Code for task#41776. 2021-08-25 19:55:28 +08:00
holan20180123 7634ed89a2 * Fix bug #14589. 2021-08-24 14:26:21 +08:00