 王怡栋
|
3cf83a54c6
|
Merge branch 'master_xieqiyu_1736' into 'master'
* Fix bug#1736.
See merge request easycorp/zentaopms!3094
|
2022-04-24 07:00:20 +00:00 |
|
|
王怡栋
|
480ca71da8
|
Merge branch 'fixbug' into 'master'
* Fix bug #17602,14850,21439.
See merge request easycorp/zentaopms!3097
|
2022-04-24 07:00:04 +00:00 |
|
|
王怡栋
|
048688e7e0
|
Merge branch 'sprint/fixbug_hufangzhou_17335' into 'master'
* Fix bug #17335.
See merge request easycorp/zentaopms!3095
|
2022-04-24 06:45:34 +00:00 |
|
|
王怡栋
|
e2f34e0f19
|
Merge branch 'sprint/fixbug_hufangzhou_17446' into 'master'
* Fix bug #17446.
See merge request easycorp/zentaopms!3093
|
2022-04-24 06:42:54 +00:00 |
|
|
王怡栋
|
1b25be3932
|
Merge branch 'master_xieqiyu_21947' into 'master'
* Fix bug#21947.
See merge request easycorp/zentaopms!3092
|
2022-04-24 06:42:36 +00:00 |
|
|
王怡栋
|
9d96c4d3ac
|
Merge branch 'liyuchun_fixbug_7008' into 'master'
* Fix bug #7008.
See merge request easycorp/zentaopms!3071
|
2022-04-24 06:41:59 +00:00 |
|
|
王怡栋
|
ff13c87122
|
Merge branch 'liyuchun_fixbug_21960' into 'master'
* Fix bug #21960.
See merge request easycorp/zentaopms!3099
|
2022-04-24 06:39:53 +00:00 |
|
|
tanghucheng
|
c72bd0a1df
|
* Fix bug #18209.
|
2022-04-24 14:27:19 +08:00 |
|
|
liyuchun
|
65a55d4fc8
|
* Fix bug #21960.
|
2022-04-24 06:26:15 +00:00 |
|
|
tanghucheng
|
cbec525102
|
* Fix bug #17602.
|
2022-04-24 13:55:08 +08:00 |
|
|
tanghucheng
|
bc1a55d155
|
* Fix bug #14850.
|
2022-04-24 13:39:19 +08:00 |
|
|
朱金勇
|
cdd433b945
|
Merge branch 'sprint/sunhao/new_zui_icons' into 'master'
* add new icons: thumb-up-solid, thumb-down-solid.
See merge request easycorp/zentaopms!3096
|
2022-04-24 05:30:14 +00:00 |
|
|
朱金勇
|
13039165a1
|
Merge branch 'api_zry' into 'master'
Api zry
See merge request easycorp/zentaopms!3090
|
2022-04-24 05:13:24 +00:00 |
|
|
Hao Sun
|
48a54b32f7
|
* add new icons: thumb-up-solid, thumb-down-solid.
|
2022-04-24 11:18:16 +08:00 |
|
|
hufangzhou
|
1acb25fc6c
|
* Fix bug #17335.
|
2022-04-24 11:02:17 +08:00 |
|
|
xieqiyu
|
f5a269af8a
|
* Fix bug#1736.
|
2022-04-24 10:48:14 +08:00 |
|
|
hufangzhou
|
961e46d820
|
* Fix bug #17446.
|
2022-04-24 10:20:35 +08:00 |
|
|
李玉春
|
933de97931
|
Merge branch 'mayue_fix_bug#21948' into 'master'
* Fix bug #21948.
See merge request easycorp/zentaopms!3091
|
2022-04-24 01:59:05 +00:00 |
|
|
mayue
|
181d0d67de
|
* Fix bug #21948.
|
2022-04-24 09:58:10 +08:00 |
|
|
liyuchun
|
f0b8309968
|
Merge branch 'cyy_21322'
|
2022-04-24 09:57:05 +08:00 |
|
|
李玉春
|
49708b72a0
|
Merge branch 'master' into 'cyy_21322'
# Conflicts:
# module/api/control.php
|
2022-04-24 01:56:10 +00:00 |
|
|
tanghucheng
|
76c0462119
|
* Fix bug #21439.
|
2022-04-24 01:53:07 +00:00 |
|
|
xieqiyu
|
3a533b72c9
|
* Fix bug#21947.
|
2022-04-24 09:48:31 +08:00 |
|
|
mayue
|
2ed8646488
|
* Fix bug #21948.
|
2022-04-24 09:31:14 +08:00 |
|
|
caoyanyi
|
8d21788052
|
* Modify export data.
|
2022-04-24 09:21:54 +08:00 |
|
|
caoyanyi
|
be8dd4535c
|
* Modify editor file path for app.
|
2022-04-24 08:48:26 +08:00 |
|
|
zhengrunyu
|
c1d6baa91a
|
* Add black.
|
2022-04-24 08:45:49 +08:00 |
|
|
朱金勇
|
d484790e8a
|
Merge branch 'sprint/sunhao/fix_safari_redirect_issue' into 'master'
* fix loop redirect in safari.
See merge request easycorp/zentaopms!3089
|
2022-04-24 00:40:50 +00:00 |
|
|
zhengrunyu
|
24530f75ca
|
* When create story can choise parent story.
|
2022-04-24 08:40:45 +08:00 |
|
|
Hao Sun
|
abb3d4cf84
|
* refactor.
|
2022-04-22 17:12:20 +08:00 |
|
|
Hao Sun
|
ea91c10200
|
* fix loop redirect in safari.
|
2022-04-22 17:11:12 +08:00 |
|
|
孙广明
|
0dd4f63440
|
Merge branch 'mayue_fix_bug#21706' into 'master'
* Fix bug #21706.
See merge request easycorp/zentaopms!3088
|
2022-04-22 08:10:56 +00:00 |
|
|
mayue
|
b625c5e1f2
|
* Fix bug #21706.
|
2022-04-22 16:05:13 +08:00 |
|
|
李玉春
|
07fed24c20
|
Merge branch 'master_xieqiyu_21936' into 'master'
* Fix bug#21936.
See merge request easycorp/zentaopms!3087
|
2022-04-22 08:01:57 +00:00 |
|
|
xieqiyu
|
63032ffe42
|
* Fix bug#21936.
|
2022-04-22 15:57:57 +08:00 |
|
|
孙广明
|
514aa68dc9
|
Merge branch 'sprint/fixbug_hufangzhou_18167' into 'master'
* Fix bug #18167.
See merge request easycorp/zentaopms!3086
|
2022-04-22 07:37:27 +00:00 |
|
|
hufangzhou
|
98153aa83b
|
* Rename the variable.
|
2022-04-22 15:37:10 +08:00 |
|
|
hufangzhou
|
0c57308663
|
* Fix bug #18167.
|
2022-04-22 15:29:27 +08:00 |
|
|
wangyidong
|
8c9bf2550f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-22 15:29:21 +08:00 |
|
|
wangyidong
|
a08edd3336
|
* adjust for repo.
|
2022-04-22 15:29:06 +08:00 |
|
|
王怡栋
|
ff8ad82f8f
|
Merge branch 'sprint/tianshujie_bug21916' into 'master'
Sprint/tianshujie bug21916
See merge request easycorp/zentaopms!3085
|
2022-04-22 07:15:47 +00:00 |
|
|
田淑杰
|
dffd633c11
|
* Fix bug #21917.
|
2022-04-22 15:11:37 +08:00 |
|
|
孙广明
|
10496fd993
|
Merge branch 'sprint/master_zhouxudong_16729' into 'master'
* Fix bug from max #16729.
See merge request easycorp/zentaopms!3080
|
2022-04-22 06:55:14 +00:00 |
|
|
王怡栋
|
089661adc6
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18855
See merge request easycorp/zentaopms!3083
|
2022-04-22 06:44:49 +00:00 |
|
|
王怡栋
|
fa729e5a22
|
Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug
See merge request easycorp/zentaopms!3084
|
2022-04-22 06:44:06 +00:00 |
|
|
孙广明
|
57e90b8dbc
|
* Fix bug for qiqi.
|
2022-04-22 14:42:22 +08:00 |
|
|
孙广明
|
8dec8a485b
|
* Fix bug for qiqi.
|
2022-04-22 14:31:06 +08:00 |
|
|
孙广明
|
6509056a9e
|
* Fix bug for qiqi.
|
2022-04-22 14:27:32 +08:00 |
|
|
Zongjun Lan
|
c6678ed77b
|
* fix bug undefined from
|
2022-04-22 14:16:08 +08:00 |
|
|
田淑杰
|
2aca0841d5
|
* Fix bug #21916.
|
2022-04-22 14:06:43 +08:00 |
|