 王怡栋
|
a0c4df237a
|
Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
Sprint/208 tianshujie fixbug
See merge request easycorp/zentaopms!4295
|
2022-07-01 01:41:14 +00:00 |
|
|
tianshujie
|
707efd0393
|
* Fix card rendering issues.
|
2022-07-01 09:40:00 +08:00 |
|
|
孙广明
|
cb767b9334
|
Merge branch 'fixbug_23768' into 'master'
Fixbug 23768
See merge request easycorp/zentaopms!4292
|
2022-07-01 00:54:35 +00:00 |
|
|
孙广明
|
5758f595e0
|
* Code for block bug.
|
2022-07-01 08:54:07 +08:00 |
|
|
王怡栋
|
77c4aae4fd
|
Merge branch 'liyuchun_fixbug' into 'master'
Liyuchun fixbug
See merge request easycorp/zentaopms!4293
|
2022-07-01 00:53:59 +00:00 |
|
|
liyuchun
|
9771037534
|
* Fix bug #24312.
|
2022-07-01 00:42:44 +00:00 |
|
|
孙广明
|
4d15af50a9
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of runCase in my.
See merge request easycorp/zentaopms!4290
|
2022-07-01 00:29:32 +00:00 |
|
|
sunjun
|
04d64fa539
|
fixbug_23768
|
2022-07-01 00:27:49 +00:00 |
|
|
孙广明
|
2e10b09c90
|
Merge branch 'sprint/210_mayue_bug#24643' into 'master'
* Fix bug #24643.
See merge request easycorp/zentaopms!4291
|
2022-07-01 00:27:30 +00:00 |
|
|
xieqiyu
|
c17767fcd1
|
* Fix bug of runCase in my.
|
2022-07-01 08:24:25 +08:00 |
|
|
mayue
|
828d476956
|
* Fix bug #24643.
|
2022-07-01 08:23:08 +08:00 |
|
|
王怡栋
|
e02d79647c
|
Merge branch 'sprint/master_guofeilong_24581' into 'master'
Revert "* fix bug #24581 in ZUI"
See merge request easycorp/zentaopms!4288
|
2022-07-01 00:18:09 +00:00 |
|
|
王怡栋
|
be04312358
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug for preview.
See merge request easycorp/zentaopms!4285
|
2022-07-01 00:17:54 +00:00 |
|
|
wangyidong
|
ff7ebea182
|
Merge branch 'fixbug'
|
2022-07-01 08:17:26 +08:00 |
|
|
王怡栋
|
436cf50e1b
|
Merge branch 'master' into 'fixbug'
# Conflicts:
# module/setting/model.php
|
2022-07-01 00:17:01 +00:00 |
|
|
孙广明
|
2dd56547e0
|
Merge branch 'sprint210_zg_24561' into 'master'
* Fix bug#24561
See merge request easycorp/zentaopms!4284
|
2022-07-01 00:15:25 +00:00 |
|
|
孙广明
|
f04bcce5cf
|
Merge branch 'fixbug_22007' into 'master'
fixbug_22007
See merge request easycorp/zentaopms!4286
|
2022-07-01 00:15:12 +00:00 |
|
|
guofeilong
|
aaccdf4460
|
Revert "* fix bug #24581 in ZUI"
This reverts commit 23a07709fd.
|
2022-06-30 09:49:32 +00:00 |
|
|
tanghucheng
|
78608484b7
|
* Fix bug #24638.
|
2022-06-30 17:26:57 +08:00 |
|
|
sunjun
|
183b1a716b
|
fixbug_23768
|
2022-06-30 09:26:19 +00:00 |
|
|
zenggang
|
dbced34eb7
|
* Adjust code
|
2022-06-30 09:20:00 +00:00 |
|
|
sunjun
|
7882690c49
|
fixbug_22007
|
2022-06-30 09:16:49 +00:00 |
|
|
zhouxudong
|
3970773281
|
* Fix bug for preview.
|
2022-06-30 09:08:57 +00:00 |
|
|
zenggang
|
3ccb521c65
|
* Fix bug#24561
|
2022-06-30 09:06:44 +00:00 |
|
|
王怡栋
|
c168920eab
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Iframe and disable will be invalid.
See merge request easycorp/zentaopms!4282
|
2022-06-30 08:56:39 +00:00 |
|
|
王怡栋
|
c62fb3f304
|
Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #24609, #24611.
See merge request easycorp/zentaopms!4281
|
2022-06-30 08:56:01 +00:00 |
|
|
liyuchun
|
7159907f1c
|
* Fix bug #23872.
|
2022-06-30 08:55:39 +00:00 |
|
|
王怡栋
|
87df303397
|
Merge branch 'fixbug' into 'master'
* Fix bug #24638.
See merge request easycorp/zentaopms!4283
|
2022-06-30 08:55:15 +00:00 |
|
|
tanghucheng
|
fd34910cf7
|
* Fix bug #24638.
|
2022-06-30 16:53:39 +08:00 |
|
|
liumengyi
|
d65ba3736d
|
* Fix bug #24609.
|
2022-06-30 16:44:36 +08:00 |
|
|
liumengyi
|
cc8c52ae8d
|
* Fix bug #24611.
|
2022-06-30 16:44:18 +08:00 |
|
|
王怡栋
|
70a58529fe
|
Merge branch 'master_xieqiyu_24227' into 'master'
* Fix bug#24227.
See merge request easycorp/zentaopms!4277
|
2022-06-30 08:35:25 +00:00 |
|
|
zhouxudong
|
502e3db733
|
* Iframe and disable will be invalid.
|
2022-06-30 08:35:22 +00:00 |
|
|
王怡栋
|
035033a042
|
Merge branch 'sprint/209_hufangzhou_sqlconfirm' into 'master'
* Add the sql confirm.
See merge request easycorp/zentaopms!4280
|
2022-06-30 08:34:26 +00:00 |
|
|
xieqiyu
|
f45d133784
|
* Modify title color.
|
2022-06-30 16:26:59 +08:00 |
|
|
hufangzhou
|
ca595e9c86
|
* Add the sql confirm.
|
2022-06-30 16:24:41 +08:00 |
|
|
xieqiyu
|
28411d109a
|
* Delete title color.
|
2022-06-30 16:19:26 +08:00 |
|
|
孙广明
|
d09fc4e65f
|
Merge branch 'sprint/207_mayue_bug#24639' into 'master'
* Fix bug #24639.
See merge request easycorp/zentaopms!4279
|
2022-06-30 08:18:23 +00:00 |
|
|
mayue
|
01fd78720c
|
* Fix bug #24639.
|
2022-06-30 16:17:47 +08:00 |
|
|
mayue
|
2e3416c4c8
|
* Fix bug #24639.
|
2022-06-30 16:15:10 +08:00 |
|
|
xieqiyu
|
552421f7db
|
* Fix bug#24227.
|
2022-06-30 15:49:24 +08:00 |
|
|
王怡栋
|
c216e570a9
|
Merge branch 'sprint/master_guofeilong_24581' into 'master'
* fix bug #24581 in ZUI
See merge request easycorp/zentaopms!4276
|
2022-06-30 07:43:37 +00:00 |
|
|
王怡栋
|
93e62bbc7d
|
Merge branch 'sprint/master_zhouxudong_23741' into 'master'
* Fix bug #23741.
See merge request easycorp/zentaopms!4274
|
2022-06-30 07:42:51 +00:00 |
|
|
guofeilong
|
23a07709fd
|
* fix bug #24581 in ZUI
|
2022-06-30 07:36:50 +00:00 |
|
|
王怡栋
|
8affb6ded3
|
Merge branch 'sprint/209_hufangzhou_24623' into 'master'
* Fix bug #24623.
See merge request easycorp/zentaopms!4269
|
2022-06-30 07:35:41 +00:00 |
|
|
zhouxudong
|
e87d50a738
|
* Fix bug #23741.
|
2022-06-30 07:35:12 +00:00 |
|
|
hufangzhou
|
99b2694d90
|
* Add the comment.
|
2022-06-30 15:34:02 +08:00 |
|
|
王怡栋
|
4126074ba5
|
Merge branch 'sprint/209_hufangzhou_24626' into 'master'
* Fix bug #24626.
See merge request easycorp/zentaopms!4273
|
2022-06-30 07:20:45 +00:00 |
|
|
hufangzhou
|
4336b35a36
|
* Fix bug #24626.
|
2022-06-30 15:13:34 +08:00 |
|
|
孙广明
|
05e02b7325
|
Merge branch 'sprint/207_mayue_bug#24602' into 'master'
* Fix bug #24602.
See merge request easycorp/zentaopms!4267
|
2022-06-30 07:11:05 +00:00 |
|