Commit Graph

881 Commits

Author SHA1 Message Date
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
李玉春
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
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
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
qiyu-xie
b304b97f61 * Finish task#41780. 2021-08-24 08:50:28 +08:00
孙广明
1531acf289 * Finish task #41748. 2021-08-20 14:44:30 +08:00
王怡栋
4c841a2f23 * finish task #41529. 2021-08-20 13:58:50 +08:00
tianshujie98
026eaacf91 * Finish task #41552. 2021-08-19 10:12:01 +08:00
qiyu-xie
a760652e04 * Finish task#41559. 2021-08-18 16:36:38 +08:00
tianshujie98
4afeac075b * Fix bug #14395. 2021-08-17 13:06:27 +08:00
holan20180123
ffe03244d9 * Code for task #41238. 2021-08-17 08:51:44 +08:00
holan20180123
f87de9e569 * Code for task #41238. 2021-08-16 16:16:32 +08:00
qiyu-xie
28e579f781 * Task#41218. 2021-08-11 22:21:06 +08:00
dingguodong
f15f007087 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 18:00:25 +08:00
dingguodong
ec56a0fed2 * Add API 404 handler for product and project. 2021-08-11 17:59:44 +08:00
qiyu-xie
99ef4f4c33 * Task#41217. Modify locate link when manage members. 2021-08-11 17:42:51 +08:00
qiyu-xie
4acca21bde * Finish task#41217. 2021-08-11 16:55:12 +08:00
holan20180123
487662ad62 * Finish task #41237. 2021-08-11 10:58:03 +08:00
tianshujie98
62cdfe2198 * Fix bug #14049. 2021-08-05 13:25:34 +08:00