Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
41,380 Commits 2 Branches 292 Tags
31dda1ebb8a076b5cc0c7db7181cf15104a5f3aa
Commit Graph
41380 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tianshujie 31dda1ebb8 * Fix bug #24686. 2022-07-04 08:16:34 +08:00
王怡栋 f1a7448b71 Merge branch 'sprint/wangzemei/bug24134' into 'master' 
* Fix bug24134

See merge request easycorp/zentaopms!4310
zentaopms_17.2 		2022-07-01 09:15:14 +00:00
wangzemei 580085c24c * Fix bug24134 2022-07-01 09:07:44 +00:00
孙广明 f27977ce07 Merge branch 'sgm_fixbug' into 'master' 
* Fix kanban error.

See merge request easycorp/zentaopms!4309
 2022-07-01 06:39:54 +00:00
孙广明 1454cee84f * Fix kanban error. 2022-07-01 14:39:16 +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
王怡栋 2df50ce39f Merge branch 'fixbug' into 'master' 
* Fix bug for workflow.

See merge request easycorp/zentaopms!4305
 2022-07-01 05:01:51 +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
tanghucheng 9a89e816d9 Merge branch 'fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into fixbug 2022-07-01 12:25:12 +08:00
tanghucheng dbfc1e6dac * Fix bug for workflow. 2022-07-01 12:24:52 +08:00
wangzemei 85e14d173a * Fix bug24393 2022-07-01 04:23:39 +00:00
王怡栋 397912b60e Merge branch 'sprint/master_zhouxudong_bug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!4299
 2022-07-01 03:25:13 +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
zhouxudong 130e376976 * Fix bug. 2022-07-01 02:41:58 +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
王怡栋 16f529d724 Merge branch 'sprint/208_liumengyi_24651' into 'master' 
* Fix bug #24659.

See merge request easycorp/zentaopms!4298
 2022-07-01 02:08:53 +00:00
liumengyi 1c13ccd0ba * Fix bug #24659. 2022-07-01 10:05:33 +08:00
王怡栋 91fbb69338 Merge branch 'sprint/208_liumengyi_24651' into 'master' 
* Fix bug #24651.

See merge request easycorp/zentaopms!4297
 2022-07-01 01:44:35 +00: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
王怡栋 b603b540ba Merge branch 'sprint/electron_zentao_style' into 'master' 
* mv style.

See merge request easycorp/zentaopms!4296
 2022-07-01 01:41:28 +00:00
王怡栋 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
dingyongliang eb3fb5ea71 * mv style. 2022-07-01 01:39:33 +00: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
王怡栋 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