 孙广明
|
8d9fb81d9d
|
Merge branch 'master' into 'sprint/174_hufangzhou_45085'
# Conflicts:
# module/story/model.php
|
2021-11-29 07:26:45 +00:00 |
|
|
hufangzhou
|
883f87a19c
|
* Remove the unused code.
|
2021-11-29 15:24:46 +08:00 |
|
|
hufangzhou
|
bf1ca5893e
|
* Modify the url when refresh the tree browse in project module.
|
2021-11-29 15:20:48 +08:00 |
|
|
孙广明
|
5ad303eca9
|
Merge branch 'sprint/174_xieqiyu_45080' into 'master'
Sprint/174 xieqiyu 45080
See merge request easycorp/zentaopms!644
|
2021-11-29 06:58:17 +00:00 |
|
|
hufangzhou
|
a42131daee
|
* Finish task #45006.
|
2021-11-29 14:17:05 +08:00 |
|
|
xieqiyu
|
78134ccb9b
|
* Code for task#45082. Restore code.
|
2021-11-29 14:14:10 +08:00 |
|
|
王怡栋
|
ae346dd200
|
* adjust for set api version.
|
2021-11-29 14:06:00 +08:00 |
|
|
hufangzhou
|
dcb0891ebc
|
* Finish task #45023.
|
2021-11-29 14:04:38 +08:00 |
|
|
xieqiyu
|
93ae2728f9
|
* Code for task#45082.
|
2021-11-29 14:03:32 +08:00 |
|
|
xieqiyu
|
22e4a664c1
|
* Code for task#45082.
|
2021-11-29 13:49:30 +08:00 |
|
|
王怡栋
|
92eabf46ab
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-11-29 13:38:54 +08:00 |
|
|
王怡栋
|
029870ccdb
|
* adjust for task team hour.
|
2021-11-29 13:38:32 +08:00 |
|
|
hufangzhou
|
0965e74d0e
|
* Finish task #45085. Fix bug #16792.
|
2021-11-29 13:19:55 +08:00 |
|
|
zhujinyong
|
0d88abfcdb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-11-29 13:09:19 +08:00 |
|
|
zhujinyong
|
be26a7c731
|
* Fix errors of api.
|
2021-11-29 13:09:05 +08:00 |
|
|
王怡栋
|
584ef7aa49
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-11-29 13:07:03 +08:00 |
|
|
王怡栋
|
8fc78ccd45
|
* adjust for api.
|
2021-11-29 13:06:47 +08:00 |
|
|
李玉春
|
64492f388b
|
Merge branch 'sprint/174_songchenxuan_45028' into 'master'
* Fix task 45028.
See merge request easycorp/zentaopms!635
|
2021-11-29 03:15:52 +00:00 |
|
|
zhujinyong
|
4b57e8627b
|
* Fix api of program.
|
2021-11-28 22:17:33 +08:00 |
|
|
xieqiyu
|
763ae6ea87
|
* Code for task#45082.
|
2021-11-28 19:54:47 +08:00 |
|
|
songchenxuan
|
eebabad646
|
* Fix task 45028.
|
2021-11-26 17:34:19 +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 |
|