 liumengyi
|
85f2a10cbd
|
* Finish task #43909.
|
2021-11-11 09:07:49 +08:00 |
|
|
liumengyi
|
2182c4dee5
|
* Finish task #43909.
|
2021-11-11 08:55:29 +08:00 |
|
|
liumengyi
|
651af21958
|
* Finish task #43909.
|
2021-11-10 13:09:09 +08:00 |
|
|
liumengyi
|
a76e32591e
|
* Finish task #43909.
|
2021-11-10 11:30:04 +08:00 |
|
|
liumengyi
|
6bdf3553d1
|
* Finish task#43909.
|
2021-11-10 09:05:58 +08:00 |
|
|
liumengyi
|
8d79bbfd34
|
Merge branch 'sprint/170_liumengyi_43909' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_liumengyi_43909
|
2021-11-10 08:44:49 +08:00 |
|
|
liumengyi
|
7203acb7af
|
* Finish task#43909.
|
2021-11-09 17:25:14 +08:00 |
|
|
liumengyi
|
ed537c1415
|
* Finish task#43909.
|
2021-11-09 17:22:09 +08:00 |
|
|
liumengyi
|
91e67125f4
|
* Finish task#43909.
|
2021-11-09 17:16:10 +08:00 |
|
|
liumengyi
|
323b167922
|
Merge branch 'sprint/170_liumengyi_43909' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_liumengyi_43909
|
2021-11-09 17:09:54 +08:00 |
|
|
李玉春
|
11af94db7f
|
Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170'
* Merge conflicts.
See merge request easycorp/zentaopms!368
|
2021-11-09 17:05:54 +08:00 |
|
|
李玉春
|
9705edb48e
|
Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170'
* Merge conflicts.
See merge request easycorp/zentaopms!368
|
2021-11-09 08:28:32 +00:00 |
|
|
tianshujie
|
9e622a2995
|
* Merge conflicts.
|
2021-11-09 16:27:06 +08:00 |
|
|
liyuchun
|
8ee4448e4d
|
Merge branch 'sprint/170_tianshujie_43901' into sprint/170
|
2021-11-09 15:53:54 +08:00 |
|
|
zhujinyong
|
489eac1696
|
Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170
|
2021-11-09 15:53:36 +08:00 |
|
|
李玉春
|
98f519fe31
|
Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901'
# Conflicts:
# module/branch/model.php
# module/story/model.php
|
2021-11-09 07:53:17 +00:00 |
|
|
zhujinyong
|
d99765633e
|
+ Add compatibility check.
|
2021-11-09 15:52:28 +08:00 |
|
|
tianshujie
|
8e9dd74c0d
|
* Modify code logic.
|
2021-11-09 15:47:31 +08:00 |
|
|
李玉春
|
0d9fa0869a
|
Merge branch 'sprint/170_songchenxuan_15665' into 'sprint/170'
* Fix bug #15665
See merge request easycorp/zentaopms!364
|
2021-11-09 07:09:57 +00:00 |
|
|
root
|
f49cbba01d
|
* Fix bug #15665
|
2021-11-09 14:38:14 +08:00 |
|
|
tianshujie
|
5ab6fe77c2
|
* Modify code logic.
|
2021-11-09 14:21:17 +08:00 |
|
|
李玉春
|
d75156dd74
|
Merge branch 'sprint/170_songchenxuan_43918' into 'sprint/170'
* Finish task #43918.
See merge request easycorp/zentaopms!361
|
2021-11-09 06:00:23 +00:00 |
|
|
root
|
397fb3e152
|
Finish task #43918.
|
2021-11-09 13:58:39 +08:00 |
|
|
孙广明
|
90ca341898
|
Merge branch 'sprint/170_zhengrunyu_44157' into 'sprint/170'
*Finish task #44157.
See merge request easycorp/zentaopms!362
|
2021-11-09 05:58:09 +00:00 |
|
|
zhengrunyu
|
411d2429ee
|
Finish task #44157.
|
2021-11-09 13:55:56 +08:00 |
|
|
zhengrunyu
|
928784c9a9
|
Finish task #44157.
|
2021-11-09 13:52:13 +08:00 |
|
|
zhengrunyu
|
0f975ee3c4
|
*Finish task #44157.
|
2021-11-09 13:48:06 +08:00 |
|
|
root
|
782d1114bf
|
Finish task #43918.
|
2021-11-09 13:47:30 +08:00 |
|
|
zhengrunyu
|
57bc70b75b
|
*Finish task #44157.
|
2021-11-09 13:31:05 +08:00 |
|
|
root
|
44c44f11d1
|
Finish task #43918.
|
2021-11-09 13:25:52 +08:00 |
|
|
root
|
f23ff798b9
|
Finish task #43918.
|
2021-11-09 13:23:37 +08:00 |
|
|
root
|
627ba8e493
|
Finish task #43918.
|
2021-11-09 13:18:44 +08:00 |
|
|
root
|
8c731d67fe
|
Finish task #43918.
|
2021-11-09 13:14:05 +08:00 |
|
|
root
|
fdc54380ee
|
* Finish task #43918.
|
2021-11-09 13:08:58 +08:00 |
|
|
root
|
c0169fd823
|
* Finish task #43918.
|
2021-11-09 11:27:30 +08:00 |
|
|
root
|
ab5ee93bc3
|
* Finish task #43918.
|
2021-11-09 11:26:25 +08:00 |
|
|
孙广明
|
9d135336e8
|
Merge branch 'sprint/170_hufangzhou_43891' into 'sprint/170'
* Code for task #43891.
See merge request easycorp/zentaopms!360
|
2021-11-09 03:15:37 +00:00 |
|
|
hufangzhou
|
9c7884d905
|
* Code for task #43891.
|
2021-11-09 11:09:48 +08:00 |
|
|
root
|
67635b0317
|
* Finish task #43918.
|
2021-11-09 10:39:02 +08:00 |
|
|
root
|
c55a455a16
|
* Finish task #43918.
|
2021-11-09 10:37:48 +08:00 |
|
|
root
|
33539633d7
|
* Finish task #43918.
|
2021-11-09 10:35: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 |
|
|
李玉春
|
b9bdc8a517
|
Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.
See merge request easycorp/zentaopms!356
|
2021-11-09 01:49:16 +00:00 |
|
|
mayue
|
cafb5d08a8
|
* Fix bug #15688.
|
2021-11-09 09:47:10 +08:00 |
|
|
mayue
|
6c23d4a336
|
* Fix bug #15688.
|
2021-11-09 09:37:33 +08:00 |
|
|
李玉春
|
7edc712958
|
Merge branch 'sprint/170_xieqiyu_fixbug' into 'sprint/170'
* Fix a bug.
See merge request easycorp/zentaopms!354
|
2021-11-09 01:14:50 +00:00 |
|
|
xieqiyu
|
1c4840c2c0
|
* Fix a bug.
|
2021-11-09 09:11:16 +08:00 |
|
|
李玉春
|
821f18f770
|
Merge branch 'sprint/170_sunhao/add_icons' into 'sprint/170'
* Add new icons: version、thumbs-up、thumbs-down.
See merge request easycorp/zentaopms!318
|
2021-11-09 00:37:13 +00:00 |
|
|
root
|
b9dc220fd9
|
* Finish task #43918
|
2021-11-09 08:35:27 +08:00 |
|