Commit Graph
1161 Commits
Author SHA1 Message Date
王怡栋 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
孙广明 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
孙广明 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 545d7f2e24 * Modify the code. 2022-01-18 13:06:50 +08:00
tianshujie f257fe3e5a * Fix bug #18633. 2022-01-18 11:26:31 +08:00
liumengyi b27b06929c * Fix bug #18644. 2022-01-18 11:19:04 +08:00
liumengyi a0921f1c7d * Fix bug #18638, #18644. 2022-01-18 10:49:53 +08: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
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
孙广明 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
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
liumengyi deb8ca0142 * Code for execution kanban grouping. 2022-01-17 19:07:23 +08:00
孙广明 c29afeee58 Merge branch 'sprint/182_tianshujie_18496' into 'master'
* Fix bug #18496.

See merge request easycorp/zentaopms!1446
2022-01-17 09:25:52 +00:00
tianshujie 3ee399a75c * Fix bug #18496. 2022-01-17 16:58:56 +08:00
孙广明 48473a63dc Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462.

See merge request easycorp/zentaopms!1444
2022-01-17 08:31:47 +00:00
liumengyi 8246a600e9 * Fix bug of move card. 2022-01-17 16:27:46 +08:00
liumengyi 00f85a4ee8 * Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462. 2022-01-17 16:13:45 +08:00
孙广明 f82881b592 * Fix bugs. 2022-01-17 15:37:52 +08:00
孙广明 54ec9e1429 Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug of execution kanban.

See merge request easycorp/zentaopms!1442
2022-01-17 07:30:36 +00:00
liumengyi 9cea290feb * Fix bug of execution kanban. 2022-01-17 15:26:19 +08:00
孙广明 b0f8dabcca Merge branch 'sprint/182_tianshujie_18496' into 'master'
* Filter out cards from other swimlanes when updating cards.

See merge request easycorp/zentaopms!1434
2022-01-17 07:23:01 +00:00
hufangzhou b24cdc32ae * Fix bug #18568. 2022-01-17 15:11:06 +08:00
tianshujie 103f9b8935 * Refactored update swimlane code. 2022-01-17 14:54:08 +08:00
liumengyi 0d3ed88c1d * Delete useless code. 2022-01-17 14:40:40 +08:00
liumengyi a36a74eb7d * Fix bug of RD kanban creation and associating story. 2022-01-17 14:35:15 +08:00
tianshujie ef66f1418c * Filter out cards from other swimlanes when updating cards. 2022-01-17 12:23:21 +08:00
liumengyi 451042f0a4 * Fix bug #18491. 2022-01-17 11:12:26 +08:00
liumengyi a9a5384241 * Finish bug #18491. 2022-01-17 10:42:40 +08:00
孙广明 b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
孙广明 94e62d0a55 Merge branch 'sprint/182_tianshujie_18496' into 'kanban'
* Fix bug.

See merge request easycorp/zentaopms!1428
2022-01-17 02:27:20 +00:00
tianshujie a42faa10f1 * Fix bug. 2022-01-17 10:22:51 +08:00
liumengyi b2324c3406 * Fix bug #18485,#18474. 2022-01-17 10:13:31 +08:00
孙广明 66515d7ed8 Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* FIx bug #18489,#18478,#18466.

See merge request easycorp/zentaopms!1420
2022-01-17 00:57:03 +00:00
liumengyi cdba989f91 * Fix bug #18458,#18473. 2022-01-17 08:54:22 +08:00
王怡栋 a5459c40ed Merge branch 'sgm_kanban' into 'kanban'
* Add kanban type in query.

See merge request easycorp/zentaopms!1421
2022-01-17 00:44:13 +00:00
孙广明 758c03968f * Add kanban type in query. 2022-01-17 08:41:59 +08:00
liumengyi d45ff40e16 * Add code annotation. 2022-01-16 19:33:52 +08:00
liumengyi fc5ad0f893 * FIx bug #18489,#18478,#18466. 2022-01-16 17:11:40 +08:00
tianshujie 53fbf25f17 * Adjust css of kanban view. 2022-01-14 15:18:56 +08:00
tianshujie 1097e61db8 * Adjust css of kanban view. 2022-01-14 15:14:53 +08:00
孙广明 b01e1901a0 Merge branch 'kanban' into 'sprint/182_liumengyi_movecard'
# Conflicts:
#   module/execution/control.php
2022-01-14 07:06:18 +00:00