 tianshujie
|
d2f57affa6
|
* Finish task #45000.
|
2021-11-30 10:30:36 +08:00 |
|
|
tianshujie
|
826a99a0b7
|
* Finish task #45005,45007.
|
2021-11-30 10:12:47 +08:00 |
|
|
李玉春
|
0cf53a32e0
|
Merge branch 'sprint/174_songchenxuan_45048' into 'master'
* Finish task 45048.
See merge request easycorp/zentaopms!650
|
2021-11-29 09:37:35 +00:00 |
|
|
songchenxuan
|
c43a6b58f5
|
* Finish task #45028.
|
2021-11-29 17:37:18 +08:00 |
|
|
李玉春
|
a3043640ae
|
Merge branch 'sprint/174_tianshujie_45081' into 'master'
* Finish task #45081.
See merge request easycorp/zentaopms!653
|
2021-11-29 09:37:12 +00:00 |
|
|
李玉春
|
80b3bcf938
|
Merge branch 'sprint/174_songchenxuan_fix_importfromlib_bug' into 'master'
* Fix bug testcase_importfromlib.
See merge request easycorp/zentaopms!645
|
2021-11-29 09:36:36 +00:00 |
|
|
tianshujie
|
b51f3c957d
|
* Adjust code of story model.
|
2021-11-29 17:34:50 +08:00 |
|
|
songchenxuan
|
76e0a170f0
|
* Finish task #45028.
|
2021-11-29 17:30:52 +08:00 |
|
|
tianshujie
|
25d07bb7a9
|
* Delete unused code.
|
2021-11-29 17:17:59 +08:00 |
|
|
songchenxuan
|
a1d18bd94e
|
* Finish task 45048.
|
2021-11-29 17:15:57 +08:00 |
|
|
tianshujie
|
0c33d76709
|
* Finish task #45081.
|
2021-11-29 17:14:01 +08:00 |
|
|
李玉春
|
c7a740e915
|
Merge branch 'sprint/174_mayue_16603' into 'master'
* Fix bug #16603.
See merge request easycorp/zentaopms!652
|
2021-11-29 09:12:24 +00:00 |
|
|
mayue
|
fb15cb3bd1
|
* Fix bug #16603.
|
2021-11-29 17:05:23 +08:00 |
|
|
王怡栋
|
9b6c38f289
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-11-29 16:45:26 +08:00 |
|
|
王怡栋
|
3c490f50c7
|
* adjust for ping.
|
2021-11-29 16:45:10 +08:00 |
|
|
songchenxuan
|
908f51250b
|
* Fix bug #15737.
|
2021-11-29 16:17:04 +08:00 |
|
|
liyuchun
|
8b65a6c8ef
|
Merge branch 'sprint/174_tianshujie_45081'
|
2021-11-29 16:03:48 +08:00 |
|
|
李玉春
|
a99419f0c5
|
Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
# module/product/control.php
# module/story/view/batchedit.html.php
|
2021-11-29 08:03:38 +00:00 |
|
|
tianshujie
|
adb2c12935
|
* Modify the code.
|
2021-11-29 15:54:48 +08:00 |
|
|
王怡栋
|
3050ba859d
|
* add ping for api.
|
2021-11-29 15:49:26 +08:00 |
|
|
王怡栋
|
98ab035758
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-11-29 15:29:26 +08:00 |
|
|
王怡栋
|
21e42772b2
|
* add lang for api.
|
2021-11-29 15:29:00 +08:00 |
|
|
孙广明
|
45953a3d13
|
Merge branch 'sprint/174_hufangzhou_45085'
|
2021-11-29 15:27:07 +08:00 |
|
|
孙广明
|
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 |
|
|
songchenxuan
|
28eaf804d4
|
* Fix bug testcase_importfromlib.
|
2021-11-29 14:30:50 +08:00 |
|
|
hufangzhou
|
a42131daee
|
* Finish task #45006.
|
2021-11-29 14:17:05 +08:00 |
|
|
tianshujie
|
96a46aa2ca
|
* Modify the code.
|
2021-11-29 14:16:10 +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 |
|
|
tianshujie
|
f2b60bda9e
|
* Finish task #45011.
|
2021-11-27 19:17:38 +08:00 |
|
|
tianshujie
|
0690823866
|
* Finish task #45030.
|
2021-11-27 18:58:33 +08:00 |
|
|
tianshujie
|
582f0e036d
|
* Finish task #45043.
|
2021-11-27 18:14:41 +08:00 |
|
|
tianshujie
|
3bddd21087
|
* Finish task #45083.
|
2021-11-27 17:58:52 +08:00 |
|
|
tianshujie
|
f4d1a727a7
|
* Finish task #45084,44994,44993.
|
2021-11-27 17:41:42 +08:00 |
|