Commit Graph
28006 Commits
Author SHA1 Message Date
朱金勇 5e285ba992 Merge branch 'sprint/zhouxudong_fixbug_13636' into 'master'
*Fix bug #13636.

See merge request easycorp/zentaopms!1384
2022-01-18 05:06:01 +00:00
孙广明 34a41b82d1 Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18644.

See merge request easycorp/zentaopms!1465
2022-01-18 03:21:04 +00:00
liumengyi b27b06929c * Fix bug #18644. 2022-01-18 11:19:04 +08:00
hufangzhou afe5025006 * Finish task #47308. 2022-01-18 10:59:28 +08:00
孙广明 24de4b423c Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18638, #18644.

See merge request easycorp/zentaopms!1461
2022-01-18 02:52:44 +00:00
liumengyi a0921f1c7d * Fix bug #18638, #18644. 2022-01-18 10:49:53 +08:00
朱金勇 d39aa0ecbb Merge branch 'zentao_client_fix' into 'master'
Zentao client fix

See merge request easycorp/zentaopms!1460
2022-01-18 02:33:01 +00: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
tianshujie a66f16dae6 * Modify the code. 2022-01-18 10:02:40 +08:00
tianshujie 1642b2b63f * Fixed the error of creating sub-columns and the update of task cards. 2022-01-18 09:57:19 +08: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
王怡栋 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
chaideqing 250d944b73 * fix bug #18039,task #47399, show html page when in client create bug/story/task/doc/todo 2022-01-17 14:40:39 +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