Commit Graph
34064 Commits
Author SHA1 Message Date
liyuchun a94497ea89 * Code for task #59439. 2022-07-05 01:23:26 +00:00
liyuchun dd893ce8e1 * Finish task #59437,59438. 2022-07-04 07:36:29 +00:00
caoyanyi 30850025f5 * Modify tab menu. 2022-07-04 10:44:06 +08:00
孙广明 52a588ec90 * Code for kanban error. 2022-07-01 14:38:20 +08:00
王怡栋 190890790a Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of edit and close branch button.

See merge request easycorp/zentaopms!4308
2022-07-01 05:30:04 +00:00
xieqiyu 727446a03b * Fix bug of edit and close branch button. 2022-07-01 13:22:09 +08:00
王怡栋 b321a22c57 Merge branch 'sprint/master_zhouxudong_batchcreateTask' into 'master'
* Fix bug of batchCreate Task.

See merge request easycorp/zentaopms!4307
2022-07-01 05:21:54 +00:00
李玉春 e8982be13f Merge branch 'sprint/wangzemei/bug24393' into 'master'
* Fix bug24393

See merge request easycorp/zentaopms!4306
2022-07-01 05:19:38 +00:00
zhouxudong 1e4f5f1e7d * Fix bug of batchCreate Task. 2022-07-01 05:19:00 +00:00
孙广明 9c7951f816 Merge branch 'sprint/210_mayue_bug#24656' into 'master'
* Fix bug #24656.

See merge request easycorp/zentaopms!4302
2022-07-01 05:08:59 +00:00
孙广明 e37ccb374b Merge branch 'zg_24663' into 'master'
* Fix bug #24663,24668

See merge request easycorp/zentaopms!4301
2022-07-01 05:08:49 +00:00
王怡栋 86ccac68ad Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
* Fix bug #24648.

See merge request easycorp/zentaopms!4304
2022-07-01 05:01:09 +00:00
王怡栋 4b2b0ac214 Merge branch 'sprint/208_tianshujie_24393' into 'master'
* Restore code.

See merge request easycorp/zentaopms!4303
2022-07-01 05:00:40 +00:00
wangzemei 85e14d173a * Fix bug24393 2022-07-01 04:23:39 +00:00
zenggang b57e6522ef * Fix bug#24668 2022-07-01 03:24:45 +00:00
zenggang 3b87d63a4b * Fix bug #24663 2022-07-01 02:59:20 +00:00
tianshujie e2ff037dad * Fix bug #24648. 2022-07-01 10:18:40 +08:00
mayue ead619d5e3 * Fix bug #24656. 2022-07-01 10:14:04 +08:00
liumengyi 1c13ccd0ba * Fix bug #24659. 2022-07-01 10:05:33 +08:00
liumengyi 16e0011b79 * Fix bug #24651. 2022-07-01 09:43:22 +08:00
王怡栋 9308719e88 Merge branch 'sprint209_leiyong_fix_bug' into 'master'
* Fix bug#24443.

See merge request easycorp/zentaopms!4294
2022-07-01 01:41:47 +00:00
tianshujie 707efd0393 * Fix card rendering issues. 2022-07-01 09:40:00 +08:00
leiyong 1998b07da7 * Fix bug#24443. 2022-07-01 01:18:32 +00: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
王怡栋 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
王怡栋 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
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
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