Commit Graph
27882 Commits
Author SHA1 Message Date
王怡栋 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
孙广明 30b2d61c71 Merge branch 'sprint/182_tianshujie_18475' into 'kanban'
* Fix bug #18475.

See merge request easycorp/zentaopms!1416
2022-01-17 00:35:57 +00:00
hufangzhou 59df7f51f6 * Finish task #47307. 2022-01-14 15:29:07 +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
tianshujie a838e62257 * Fix bug #18475. 2022-01-14 15:12:29 +08:00
孙广明 8707d80112 Merge branch 'sprint/182_tianshujie_47350' into 'kanban'
* Finish task #47350.

See merge request easycorp/zentaopms!1414
2022-01-14 07:07:40 +00:00
tianshujie 947c9586f5 * Finish task #47350. 2022-01-14 15:06:22 +08:00
孙广明 b01e1901a0 Merge branch 'kanban' into 'sprint/182_liumengyi_movecard'
# Conflicts:
#   module/execution/control.php
2022-01-14 07:06:18 +00:00
liumengyi 0167541bb4 * Add move card for execution-kanban. 2022-01-14 15:00:36 +08:00
tianshujie a241dc5b11 * Finish task #47350. 2022-01-14 14:51:48 +08:00
李玉春 d36e3212e1 Merge branch 'sprint/182_tianshujie_column' into 'kanban'
* Modify the problem of creating a bug lane and reporting an error.

See merge request easycorp/zentaopms!1412
2022-01-14 06:44:35 +00:00
tianshujie 8399a61753 * Modify the problem of creating a bug lane and reporting an error. 2022-01-14 14:41:13 +08:00
王怡栋 25d152f63d Merge branch 'sgm_kanban' into 'kanban'
* Fix details and add upgrade logic.

See merge request easycorp/zentaopms!1411
2022-01-14 06:37:28 +00:00
孙广明 19aaf9740c * Fix details and add upgrade logic. 2022-01-14 14:31:59 +08:00
孙广明 31492d118b Merge branch 'sprint/182_tianshujie_kanban' into 'kanban'
* Finish task #47359,47360.

See merge request easycorp/zentaopms!1410
2022-01-14 05:53:56 +00:00
tianshujie 62b9d82679 * Modify default value. 2022-01-14 13:53:04 +08:00
tianshujie 61590215c1 * Finish task #47359,47360. 2022-01-14 13:47:30 +08:00
孙广明 13e653f600 * Process kanban execution. 2022-01-14 13:34:47 +08:00
孙广明 5ecba2a5da Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* Fix bug for task#47355 #47346.

See merge request easycorp/zentaopms!1407
2022-01-14 05:11:33 +00:00
liumengyi 15db546ff1 * Fix bug for task#47355 #47346. 2022-01-14 13:09:01 +08:00
孙广明 855d954383 Merge branch 'sprint/182_hufangzhou_independLane' into 'kanban'
* Modify the create independent lane of common signboard.

See merge request easycorp/zentaopms!1406
2022-01-14 05:08:05 +00:00
hufangzhou c03939c7e7 * Modify the create independent lane of common signboard. 2022-01-14 13:06:12 +08:00
李玉春 d3ad68b4ce Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* FInish task #47346.

See merge request easycorp/zentaopms!1401
2022-01-14 02:54:41 +00:00
tianshujie 6992338a0e * Finish task #47358. 2022-01-14 10:46:54 +08:00
liumengyi b9aa4a0d0d * FInish task #47346. 2022-01-14 10:45:53 +08:00
李玉春 f214890ac1 Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* Fix bug #18436.Finish task #47361.

See merge request easycorp/zentaopms!1400
2022-01-14 02:17:05 +00:00
liumengyi 582ddf2a06 * Fix bug #18436.Finish task #47361. 2022-01-14 10:14:40 +08:00
李玉春 899bd99653 Merge branch 'sgm_kanban' into 'kanban'
* Adjust code.

See merge request easycorp/zentaopms!1393
2022-01-14 01:56:14 +00:00
李玉春 bf0722144f Merge branch 'sprint/182_liumengyi_47332' into 'kanban'
* Finish task #47332.

See merge request easycorp/zentaopms!1398
2022-01-14 01:33:34 +00:00
tianshujie 9093dc8fdd * Modify the code. 2022-01-14 09:31:58 +08:00
tianshujie 5fbffbac3a * Fix drop down button bug. 2022-01-14 09:30:42 +08:00
liumengyi f9d299efd2 * Finish task #47332. 2022-01-14 09:29:50 +08:00
王怡栋 9fbd47597e Merge branch 'sprint/182_hufangzhou_moveCard' into 'kanban'
* Adjust the moveCards function.

See merge request easycorp/zentaopms!1394
2022-01-14 01:09:32 +00:00
hufangzhou da89583f19 * Adjust the format code. 2022-01-14 09:06:44 +08:00
hufangzhou df1dabef27 * Splice comma when use the instr function. 2022-01-14 09:03:30 +08:00
朱金勇 7ec3fcf19a Merge branch 'sprint/182_sunhao/task47358' into 'kanban'
* Task #47358, support for setting kanban lane height with option "displayCards".

See merge request easycorp/zentaopms!1380
2022-01-14 00:27:58 +00:00
hufangzhou 97308d9d09 * Adjust the moveCards function. 2022-01-14 08:14:54 +08:00
sgm0422 907f96ecfd * Adjust code. 2022-01-13 22:56:11 +08:00
tianshujie b22160b3c7 * Add set swimlane height button. 2022-01-13 21:21:49 +08:00
tianshujie 2261371010 * Refactoring task kanban to view logic by group. 2022-01-13 21:11:23 +08:00
孙广明 a051880d2d Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* Fix bug #18419, #18414, #18411.

See merge request easycorp/zentaopms!1390
2022-01-13 09:23:36 +00:00
liumengyi 92c3693650 * Fix bug #18419, #18414, #18411. 2022-01-13 17:20:21 +08:00
王怡栋 76dc816b2c Merge branch 'sgm_upgradekanban' into 'kanban'
* Add upgrade logic.

See merge request easycorp/zentaopms!1387
2022-01-13 08:52:33 +00:00
孙广明 85f2917fe7 * Fix upgrade logic. 2022-01-13 16:43:35 +08:00
孙广明 2e4e8a1043 * Add upgrade logic. 2022-01-13 16:24:26 +08:00
liumengyi 6c1754423c * Fix bug for RD Kanban. 2022-01-13 16:06:41 +08:00
liumengyi 5d40963b8a * Fix bug for RD Kanban. 2022-01-13 16:00:42 +08:00
liumengyi 0f49102886 * Fix bug for execution kanban view. 2022-01-13 14:36:05 +08:00