Commit Graph
28030 Commits
Author SHA1 Message Date
孙广明 b09d6a161b Merge branch 'sprint/182_tianshujie_18663' into 'master'
* Fix bug #18663.

See merge request easycorp/zentaopms!1475
2022-01-18 06:05:34 +00:00
tianshujie 0c1ebe9beb * Fix bug #18663. 2022-01-18 14:04:42 +08:00
王怡栋 3c16c97cd7 Merge branch 'sgm_fixbug' into 'master'
* Fix tutorial bug.

See merge request easycorp/zentaopms!1473
2022-01-18 05:59:54 +00:00
孙广明 1b7f4cd8c7 * Fix tutorial bug. 2022-01-18 13:56:05 +08:00
孙广明 9b20857b8b Merge branch 'sprint/182_tianshujie_18643' into 'master'
* Fix bug #18643.

See merge request easycorp/zentaopms!1471
2022-01-18 05:41:01 +00:00
tianshujie 0f26e7d982 * Fix bug #18643. 2022-01-18 13:38:46 +08:00
王怡栋 d19fa0e6ef Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1470
2022-01-18 05:37:41 +00:00
孙广明 c9948abdec * Fix bug. 2022-01-18 13:35:06 +08:00
王怡栋 3f370bad4c Merge branch 'sgm_fixbug' into 'master'
* Fix kanban bug.

See merge request easycorp/zentaopms!1469
2022-01-18 05:25:33 +00:00
孙广明 625f3e6d59 * Fix kanban bug. 2022-01-18 13:24:11 +08:00
孙广明 266341191b Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18629.

See merge request easycorp/zentaopms!1468
2022-01-18 05:21:16 +00:00
liumengyi 42a352dc20 * Fix bug #18629. 2022-01-18 13:18:44 +08:00
liumengyi a7c944d3e5 * Fix bug #18629. 2022-01-18 13:16:20 +08:00
孙广明 5e5f833acf Merge branch 'xieqiyu_fixbug' into 'master'
* Fix bug: normal product can not batch change module.

See merge request easycorp/zentaopms!1467
2022-01-18 05:13:19 +00:00
孙广明 1935c26418 Merge branch 'sprint/182_tianshujie_18646' into 'master'
* Fix bug #18640,18646.

See merge request easycorp/zentaopms!1464
2022-01-18 05:12:30 +00:00
tianshujie 5d042bcbea * Modify the code. 2022-01-18 13:11:52 +08:00
xieqiyu 8092c5be0a * Fix bug: normal product can not batch change module. 2022-01-18 13:11:22 +08:00
tianshujie 545d7f2e24 * Modify the code. 2022-01-18 13:06:50 +08:00
朱金勇 5d5521ecfc Merge branch 'sprint/zhouxudong_18321' into 'master'
*Fix bug #18321.

See merge request easycorp/zentaopms!1437
2022-01-18 05:06:23 +00:00
朱金勇 5e285ba992 Merge branch 'sprint/zhouxudong_fixbug_13636' into 'master'
*Fix bug #13636.

See merge request easycorp/zentaopms!1384
2022-01-18 05:06:01 +00:00
tianshujie f257fe3e5a * Fix bug #18633. 2022-01-18 11:26:31 +08:00
tianshujie 1ebf1c4827 * Restore code. 2022-01-18 11:21:49 +08:00
孙广明 34a41b82d1 Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18644.

See merge request easycorp/zentaopms!1465
2022-01-18 03:21:04 +00:00
tianshujie 93ef9baf9f * Fix bug #18646. 2022-01-18 11:19:35 +08:00
liumengyi b27b06929c * Fix bug #18644. 2022-01-18 11:19:04 +08:00
tianshujie 470801b6aa * Fix bug #18640,18646. 2022-01-18 11:09:01 +08:00
hufangzhou afe5025006 * Finish task #47308. 2022-01-18 10:59:28 +08:00
孙广明 24de4b423c Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18638, #18644.

See merge request easycorp/zentaopms!1461
2022-01-18 02:52:44 +00:00
liumengyi a0921f1c7d * Fix bug #18638, #18644. 2022-01-18 10:49:53 +08:00
朱金勇 d39aa0ecbb Merge branch 'zentao_client_fix' into 'master'
Zentao client fix

See merge request easycorp/zentaopms!1460
2022-01-18 02:33:01 +00:00
孙广明 172b4ade25 Merge branch 'sprint/182_tianshujie_bug' into 'master'
Sprint/182 tianshujie bug

See merge request easycorp/zentaopms!1458
2022-01-18 02:03:09 +00:00
tianshujie a66f16dae6 * Modify the code. 2022-01-18 10:02:40 +08:00
tianshujie 1642b2b63f * Fixed the error of creating sub-columns and the update of task cards. 2022-01-18 09:57:19 +08:00
hufangzhou cc3abb1c0b * Add the data-contextmenu to parent column. 2022-01-18 09:55:19 +08:00
孙广明 fb8fd8b7de Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18584, #18594.

See merge request easycorp/zentaopms!1453
2022-01-18 01:32:19 +00:00
tianshujie e03ce5b677 * Fix bug #18575. 2022-01-18 09:32:07 +08:00
liumengyi 098622ffae * Fix bug #18619. 2022-01-18 09:29:04 +08:00
孙广明 139f1dbcac * Fix delay bug. 2022-01-18 09:18:13 +08:00
liumengyi c377f3b54c * Fix bug #18584, #18594. 2022-01-18 09:03:30 +08:00
王怡栋 5ef6718a93 Merge branch 'master' into 'sgm_fixbug'
# Conflicts:
#   module/kanban/model.php
2022-01-18 00:56:32 +00:00
孙广明 820993a452 * Add delay. 2022-01-18 08:52:13 +08:00
孙广明 07c98e7e1a Merge branch 'sprint/182_tianshujie_kanban' into 'master'
* Fix bug #18578,18536.

See merge request easycorp/zentaopms!1450
2022-01-18 00:50:11 +00:00
tianshujie e427e235fa * Modify the code logic. 2022-01-18 08:45:58 +08:00
tianshujie b7d74b1131 * Fix the problem of demand status flow. 2022-01-18 08:36:18 +08:00
liumengyi dd99e46107 * Fix bug #18619. 2022-01-18 08:17:21 +08:00
tianshujie cb1f7a634e * Fix bug #18578,18536. 2022-01-17 23:49:54 +08:00
孙广明 62ac473b45 Merge branch 'sprint/182_liumengyi_groupby' into 'master'
* Code for execution kanban grouping.

See merge request easycorp/zentaopms!1449
2022-01-17 11:09:11 +00:00
liumengyi deb8ca0142 * Code for execution kanban grouping. 2022-01-17 19:07:23 +08:00
liumengyi 79813a2166 * Modify judgment. 2022-01-17 18:53:45 +08:00
liumengyi c11615933a * Fix bug #18625. 2022-01-17 18:51:50 +08:00