 朱金勇
|
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 |
|
|
李玉春
|
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 |
|
|
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 |
|
|
Zongjun Lan
|
c80e84b73e
|
* fix bug #18855
|
2022-04-22 14:00:33 +08:00 |
|
|
王怡栋
|
0559230b1c
|
Merge branch 'sprint/fixbug_liumengyi_3079' into 'master'
* Fix bug #3079.
See merge request easycorp/zentaopms!3081
|
2022-04-22 05:59:27 +00:00 |
|
|
caoyanyi
|
38ad0cec35
|
* Adjust code.
|
2022-04-22 05:46:49 +00:00 |
|
|
caoyanyi
|
b8c0f822d9
|
* Add response data.
|
2022-04-22 05:38:48 +00:00 |
|
|
李玉春
|
449ba6884d
|
Merge branch 'sprint/tianshujie_sql' into 'master'
* Modify the sql statement.
See merge request easycorp/zentaopms!3078
|
2022-04-22 05:38:07 +00:00 |
|
|
孙广明
|
49b9ba0d04
|
Merge branch 'fixbugs_zhouxin_21934' into 'master'
* Fix bug #21934.
See merge request easycorp/zentaopms!3082
|
2022-04-22 05:36:49 +00:00 |
|
|
孙广明
|
b46946fe22
|
Merge branch 'sprint/fixerror_hufangzhou_apilib' into 'master'
* Fix code error.
See merge request easycorp/zentaopms!3076
|
2022-04-22 05:23:17 +00:00 |
|
|
zhouxin
|
0fc5c5cba6
|
* Fix bug #21934.
|
2022-04-22 05:14:53 +00:00 |
|
|
liumengyi
|
0c3aa457ce
|
* Fix bug #3079.
|
2022-04-22 13:12:02 +08:00 |
|
|
caoyanyi
|
210d2fb29f
|
* Fix bug #21322.
|
2022-04-22 05:07:13 +00:00 |
|
|
zhouxudong
|
aaffd2788c
|
* Fix bug from max #16729.
|
2022-04-22 13:07:10 +08:00 |
|
|
王怡栋
|
814599788b
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18933
See merge request easycorp/zentaopms!3067
|
2022-04-22 03:40:20 +00:00 |
|
|
李玉春
|
a60af77cfa
|
Merge branch 'bug_21893' into 'master'
Fix bug#21893
See merge request easycorp/zentaopms!3068
|
2022-04-22 03:20:09 +00:00 |
|
|
李玉春
|
b3f42a5b4a
|
Merge branch 'cyy_21898' into 'master'
* Fix bug #21898.
See merge request easycorp/zentaopms!3074
|
2022-04-22 03:19:44 +00:00 |
|
|
孙广明
|
b86fac6597
|
Merge branch 'sprint/scx_storybug' into 'master'
* Fix create substory bug.
See merge request easycorp/zentaopms!3077
|
2022-04-22 03:08:54 +00:00 |
|
|
王怡栋
|
f8ef430ad6
|
* fix error.
|
2022-04-22 10:59:30 +08:00 |
|