Commit Graph
27985 Commits
Author SHA1 Message Date
王怡栋 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
liumengyi 47e7cd7f10 * Fix bug #18625. 2022-01-17 18:46:58 +08:00
liumengyi 842ca07618 * Fix bug #18625. 2022-01-17 18:25:39 +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 97a4fb7cc9 * Adjust code of kanban and bug model. 2022-01-17 17:24:42 +08:00
tianshujie 3ee399a75c * Fix bug #18496. 2022-01-17 16:58:56 +08:00
王怡栋 48b4ae13dc Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.

See merge request easycorp/zentaopms!1445
2022-01-17 08:45:03 +00:00
孙广明 05ae6c9c06 * Fix upgrade bug. 2022-01-17 16:43:08 +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
tianshujie 9b5fa61141 * Modify the code logic. 2022-01-17 15:20:17 +08: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
孙广明 d5d14d697c Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug of RD kanban creation and associating story.

See merge request easycorp/zentaopms!1438
2022-01-17 06:50:39 +00:00
liumengyi 39a8882626 * Modify language item. 2022-01-17 14:44:47 +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
mayue be717d3937 * Optimize code. 2022-01-17 14:18:39 +08:00
tianshujie ef66f1418c * Filter out cards from other swimlanes when updating cards. 2022-01-17 12:23:21 +08:00
孙广明 10d8a74cc4 Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18491.

See merge request easycorp/zentaopms!1432
2022-01-17 03:13:47 +00:00
liumengyi 451042f0a4 * Fix bug #18491. 2022-01-17 11:12:26 +08:00
孙广明 0a02b86617 Merge branch 'sprint/182_hufangzhou_upgradeTip' into 'master'
* Change the upgrade tip to biz.

See merge request easycorp/zentaopms!1431
2022-01-17 03:11:51 +00:00
孙广明 5f4d85fbca Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Finish bug #18491.

See merge request easycorp/zentaopms!1430
2022-01-17 03:05:16 +00:00
hufangzhou 7240a4c53e * Change the upgrade tip to biz. 2022-01-17 10:58:00 +08:00
王怡栋 97ba199eeb Merge branch 'sgm_upgrade' into 'master'
* Add upgrade logic.

See merge request easycorp/zentaopms!1429
2022-01-17 02:44:01 +00:00
liumengyi a9a5384241 * Finish bug #18491. 2022-01-17 10:42:40 +08:00
孙广明 fff984acf4 * Add upgrade logic. 2022-01-17 10:42:02 +08:00
朱金勇 dce7ddc20c Merge branch 'autoTest_xieqiyu' into 'master'
Auto test xieqiyu

See merge request easycorp/zentaopms!1426
2022-01-17 02:35:38 +00: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
王怡栋 7b7d9f545d Merge branch 'sgm_upgrade' into 'kanban'
* Fix locate bug.

See merge request easycorp/zentaopms!1427
2022-01-17 02:23:56 +00:00
tianshujie a42faa10f1 * Fix bug. 2022-01-17 10:22:51 +08:00
孙广明 fd288aafc4 Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* Fix bug #18485,#18474.

See merge request easycorp/zentaopms!1424
2022-01-17 02:22:05 +00:00
孙广明 5f58ada861 * Fix locate bug. 2022-01-17 10:20:06 +08:00
hufangzhou a49076b0d8 * Fix bug #18407. 2022-01-17 10:14:50 +08:00