Commit Graph
32601 Commits
Author SHA1 Message Date
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
sgm0422 907f96ecfd * Adjust code. 2022-01-13 22:56:11 +08:00
孙广明 297fd2d674 Merge branch 'sprint/182_tianshujie_kanban' into 'kanban'
* Refactoring task kanban to view logic by group.

See merge request easycorp/zentaopms!1392
2022-01-13 13:50:07 +00: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
孙广明 276a00b126 Merge branch 'sprint/182_liumengyi_47339' into 'kanban'
* Fix bug for RD Kanban.

See merge request easycorp/zentaopms!1386
2022-01-13 08:07:27 +00: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
孙广明 1d30c7f7f5 Merge branch 'sprint/182_liumengyi_47339' into 'kanban'
* Finish task #47339.

See merge request easycorp/zentaopms!1382
2022-01-13 07:30:51 +00:00
liumengyi 0f49102886 * Fix bug for execution kanban view. 2022-01-13 14:36:05 +08:00
liumengyi 8850815c58 * Finish task #47339. 2022-01-13 14:13:03 +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
孙广明 745264b6d4 Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* Fix bug for create RD column.

See merge request easycorp/zentaopms!1377
2022-01-13 04:19:53 +00:00
liumengyi e68161620c * Remove empty space. 2022-01-13 12:19:10 +08:00
liumengyi 1cb7c2e75a * Remove menu when create kanban execution/ 2022-01-13 12:17:56 +08:00
liumengyi 1902ea4539 * Fix bug for create RD column. 2022-01-13 12:04:24 +08:00
孙广明 ca9daac505 Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* Fix bug for kanban execution.

See merge request easycorp/zentaopms!1376
2022-01-13 04:00:00 +00: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
liumengyi 0403bb58d1 * Modify the opening method of link story. 2022-01-13 11:03:21 +08:00
tianshujie bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
liumengyi fa46192342 * Modify execution kanban view. 2022-01-13 10:39:59 +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
孙广明 c417a1d14d Merge branch 'sprint/182_tianshujie_47353' into 'kanban'
* Finish task #47353.

See merge request easycorp/zentaopms!1370
2022-01-13 02:12:45 +00: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
孙广明 f0d1c51bfe * Add comment. 2022-01-12 16:49:29 +08:00
孙广明 3706a60032 * Add comment. 2022-01-12 16:47:48 +08: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
孙广明 091a64c634 Merge branch 'sprint/182_tianshujie_47336' into 'kanban'
* Finish task #47336,47344,47345.

See merge request easycorp/zentaopms!1364
2022-01-12 08:32:23 +00:00
tianshujie 8b22fdcabc * Finish task #47336,47344,47345. 2022-01-12 16:28:16 +08:00
孙广明 5d2cfa4c1e Merge branch 'sprint/182_tianshujie_47336' into kanban 2022-01-12 15:53:32 +08:00
孙广明 5a8c11cb6e Merge branch 'kanban' into 'sprint/182_tianshujie_47336'
# Conflicts:
#   module/execution/control.php
2022-01-12 07:53:04 +00:00
tianshujie c5bf8afbc2 * Modify the link judgment method. 2022-01-12 15:50:44 +08:00
孙广明 dad8b2f970 Merge branch 'sprint/182_liumengyi_kanban' into kanban 2022-01-12 15:45:35 +08:00
孙广明 ddc5b0cf1d Merge branch 'kanban' into 'sprint/182_liumengyi_kanban'
# Conflicts:
#   module/kanban/model.php
2022-01-12 07:45:15 +00:00
tianshujie 4bca0680ab * Finish task #47335. 2022-01-12 15:44:44 +08:00