 李玉春
|
0ab2f6d249
|
Merge branch 'sprint/174_tianshujie_45007' into 'master'
* Modify use case branch query conditions.
See merge request easycorp/zentaopms!667
|
2021-11-30 05:39:08 +00:00 |
|
|
李玉春
|
c30c1466d0
|
Merge branch 'sprint/174_songchenxuan_45028' into 'master'
* Finish task #45028.
See merge request easycorp/zentaopms!662
|
2021-11-30 05:19:03 +00:00 |
|
|
李玉春
|
4b223ec01b
|
Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.
See merge request easycorp/zentaopms!657
|
2021-11-30 05:02:41 +00:00 |
|
|
songchenxuan
|
b0ad71231c
|
* Finish task #45028.
|
2021-11-30 11:31:27 +08:00 |
|
|
mayue
|
71387b1d37
|
* Finish task #44987,44988,44989.
|
2021-11-30 11:26:48 +08:00 |
|
|
李玉春
|
0322f02b54
|
Merge branch 'sprint/174_songchenxuan_45018' into 'master'
* Finish task #45018.
See merge request easycorp/zentaopms!661
|
2021-11-30 03:19:57 +00:00 |
|
|
李玉春
|
adb7b76f3c
|
Merge branch 'sprint/174_songchenxuan_45049' into 'master'
Sprint/174 songchenxuan 45049
See merge request easycorp/zentaopms!643
|
2021-11-30 03:19:07 +00:00 |
|
|
tianshujie
|
2a469dc6f7
|
* Modify use case branch query conditions.
|
2021-11-30 11:17:10 +08:00 |
|
|
李玉春
|
ca91fc11f1
|
Merge branch 'sprint/174_tianshujie_45007' into 'master'
* Finish task #45005,45007.
See merge request easycorp/zentaopms!660
|
2021-11-30 03:16:27 +00:00 |
|
|
李玉春
|
2786d77fcb
|
Merge branch 'sprint/174_tianshujie_task' into 'master'
* Finish task #45081,45012.
See merge request easycorp/zentaopms!655
|
2021-11-30 03:12:42 +00:00 |
|
|
songchenxuan
|
c5deb3e68d
|
* Finish task #45028.
|
2021-11-30 10:57:49 +08:00 |
|
|
mayue
|
f2d867870a
|
* Finish task #44987,44988,44989.
|
2021-11-30 10:55:41 +08:00 |
|
|
songchenxuan
|
9efa9b1759
|
* Finish task #45018.
|
2021-11-30 10:49:38 +08:00 |
|
|
李玉春
|
106f5cfcd3
|
Merge branch 'sprint/174_hufangzhou_tree' into 'master'
* Solve the problem of mutual testing for task #45085.
See merge request easycorp/zentaopms!659
|
2021-11-30 02:46:09 +00:00 |
|
|
hufangzhou
|
7a5a4d5807
|
* Rebuild the code.
|
2021-11-30 10:44:37 +08:00 |
|
|
mayue
|
d89aa24c8c
|
* Finish task #44987,44988,44989.
|
2021-11-30 10:32:11 +08:00 |
|
|
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 |
|
|
hufangzhou
|
4736e3a01c
|
* Solve the problem of mutual testing for task #45085.
|
2021-11-30 09:59:14 +08:00 |
|
|
王怡栋
|
b3cb90e69e
|
* replace processMarkdown method.
|
2021-11-30 09:58:11 +08:00 |
|
|
王怡栋
|
ef2385a150
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-11-30 09:38:44 +08:00 |
|
|
王怡栋
|
85d498c5cb
|
* replace lib for markdown to html.
|
2021-11-30 09:38:12 +08:00 |
|
|
mayue
|
19d489a645
|
* Fix bug #44987,44988,44989.
|
2021-11-30 09:27:50 +08:00 |
|
|
tianshujie
|
7e225ce3f7
|
* Finish task #45081,45012.
|
2021-11-30 09:18:05 +08:00 |
|
|
songchenxuan
|
d19f60d9df
|
* Finish task 45049.
|
2021-11-30 08:57:36 +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 |
|
|
mayue
|
7a5c062947
|
* Finish task #44987,44988,44989.
|
2021-11-29 16:15:50 +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 |
|
|
mayue
|
fea372ea26
|
* Finish task #44987,44988,44989.
|
2021-11-29 15:45:56 +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 |
|