Commit Graph
581 Commits
Author SHA1 Message Date
tianshujie 0c1ebe9beb * Fix bug #18663. 2022-01-18 14:04:42 +08:00
tianshujie a42faa10f1 * Fix bug. 2022-01-17 10:22:51 +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
孙广明 758c03968f * Add kanban type in query. 2022-01-17 08:41:59 +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
李玉春 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
孙广明 19aaf9740c * Fix details and add upgrade logic. 2022-01-14 14:31:59 +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
tianshujie 6992338a0e * Finish task #47358. 2022-01-14 10:46:54 +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
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
王怡栋 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
liumengyi 0f49102886 * Fix bug for execution kanban view. 2022-01-13 14:36:05 +08:00
Hao Sun fa29706187 * Task #47358, support for setting kanban lane height with option "displayCards". 2022-01-13 13:10:15 +08:00
李玉春 9451a6b9f5 Merge branch 'sgm_kanban' into 'kanban'
Sgm kanban

See merge request easycorp/zentaopms!1378
2022-01-13 05:04:17 +00:00
liumengyi 1902ea4539 * Fix bug for create RD column. 2022-01-13 12:04:24 +08:00
liumengyi 0aba204fbf * Fix bug for kanban execution. 2022-01-13 11:58:28 +08:00
孙广明 c15fb8dd6f * Fix details. 2022-01-13 11:56:21 +08:00
孙广明 c4abe94616 * Code for kanban. 2022-01-13 11:45:17 +08:00
孙广明 e82f0f5655 Merge branch 'sprint/182_tianshujie_47313' into 'kanban'
* Finish task #47333,47313.

See merge request easycorp/zentaopms!1374
2022-01-13 03:18:01 +00:00
孙广明 021d9d8b9a Merge branch 'sprint/182_liumengyi_kanban' into 'kanban'
* Finish task #47334.Add card view.

See merge request easycorp/zentaopms!1372
2022-01-13 03:06:47 +00:00
tianshujie bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
liumengyi 1ea0bb4760 * Finish task #47334.Add card view. 2022-01-13 10:35:04 +08:00
tianshujie e00b854154 * Finish task #47313. 2022-01-13 10:20:51 +08:00
tianshujie b8321c127a * Finish task #47353. 2022-01-13 10:10:30 +08:00
孙广明 ff650dd8fb Merge branch 'sprint/182_tianshujie_47352' into 'kanban'
* Finish task #47352.

See merge request easycorp/zentaopms!1369
2022-01-13 01:47:50 +00:00
tianshujie 940587e1ca * Finish task #47352. 2022-01-13 09:44:07 +08:00
王怡栋 69ca909802 Merge branch 'sgm_kanban' into 'kanban'
Sgm kanban

See merge request easycorp/zentaopms!1365
2022-01-12 08:50:10 +00:00
孙广明 4f346b4670 * Fix a bug. 2022-01-12 16:35:10 +08:00
孙广明 16b6264a75 * Refactor kanban code. 2022-01-12 16:34:01 +08:00
tianshujie 8b22fdcabc * Finish task #47336,47344,47345. 2022-01-12 16:28:16 +08:00
孙广明 5a8c11cb6e Merge branch 'kanban' into 'sprint/182_tianshujie_47336'
# Conflicts:
#   module/execution/control.php
2022-01-12 07:53:04 +00:00
孙广明 ddc5b0cf1d Merge branch 'kanban' into 'sprint/182_liumengyi_kanban'
# Conflicts:
#   module/kanban/model.php
2022-01-12 07:45:15 +00:00
liumengyi 0b334a246f * Add column menu. 2022-01-12 15:39:33 +08:00