Commit Graph
71 Commits
Author SHA1 Message Date
zhengrunyu 5b1a0f4b87 *change finished card and add status default 2022-01-27 10:35:33 +08:00
孙广明 9db830389b Merge branch 'sprint/183_tianshujie_kanban' into 'master'
* Fix kanban style issues.

See merge request easycorp/zentaopms!1620
2022-01-26 00:29:08 +00:00
tianshujie 03d3855aae * Fix kanban style issues. 2022-01-25 17:26:55 +08:00
李玉春 bde3d0ef34 Merge branch 'master' into 'sgm_47983'
# Conflicts:
#   module/kanban/css/common.css
#   module/kanban/css/view.css
2022-01-25 09:16:04 +00:00
孙广明 d243960742 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18804.

See merge request easycorp/zentaopms!1615
2022-01-25 08:57:58 +00:00
liumengyi 1bc4f4c408 * Fix bug #18804. 2022-01-25 16:55:19 +08:00
孙广明 e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
xieqiyu 7feffbdcfa * Modify test problem. 2022-01-25 14:57:15 +08:00
孙广明 cac8eaa104 Merge branch 'sprint/183_tianshujie_bug' into 'master'
Sprint/183 tianshujie bug

See merge request easycorp/zentaopms!1596
2022-01-25 05:38:26 +00:00
tianshujie 363af0483b * Remove useless code. 2022-01-25 13:37:33 +08:00
tianshujie 4185f88f29 * Fix bug #18948,18836,18804. 2022-01-25 13:27:38 +08:00
孙广明 5fec7d3964 Merge branch 'sprint/183_mayue_18875' into 'master'
* Fix bug #18875.

See merge request easycorp/zentaopms!1595
2022-01-25 05:20:04 +00:00
mayue 5ee2825c26 * Fix bug #18875. 2022-01-25 13:15:18 +08:00
xieqiyu 5d0f26bb46 * Modify the mutual test problem. 2022-01-25 13:04:32 +08:00
孙广明 df75841d5b Merge branch 'sprint/183_xt_card' into 'master'
Sprint/183 xt card

See merge request easycorp/zentaopms!1587
2022-01-25 03:19:35 +00:00
liumengyi 571f530460 * Fix bug #18936, #18924. 2022-01-25 11:03:05 +08:00
tianshujie 14c68e0cf7 * Modify card style. 2022-01-25 09:29:43 +08:00
xieqiyu 1801b1e783 * Add pending future to the product plan. 2022-01-25 09:10:26 +08:00
xieqiyu 053985fb05 * Code for task#47988. 2022-01-24 23:12:40 +08:00
tianshujie 7a7ad37f3c * Finish task #47990. 2022-01-24 18:16:28 +08:00
tianshujie 331e00ab2b * Modify area style. 2022-01-24 17:04:07 +08:00
tianshujie 281885f598 * Fix bug #18848. 2022-01-24 16:24:52 +08:00
tianshujie 0b8535a885 * Finish task #47994. 2022-01-24 12:30:30 +08:00
mayue bc20febdb0 * Optimize style. 2022-01-20 10:39:38 +08:00
mayue 65df68d61e * Finish task. 2022-01-20 10:04:44 +08:00
tianshujie 6992338a0e * Finish task #47358. 2022-01-14 10:46:54 +08:00
Hao Sun fa29706187 * Task #47358, support for setting kanban lane height with option "displayCards". 2022-01-13 13:10:15 +08:00
liumengyi 6863cd05b8 * Fix bug #17920. 2021-12-24 11:11:33 +08:00
孙广明 40d0b988d7 Merge branch 'sprint/179_tianshujie_bug' into 'master'
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1121
2021-12-23 08:59:45 +00:00
tianshujie 827b4ed3b5 * Fix bug #17694. 2021-12-23 16:56:33 +08:00
孙广明 b603c6186e Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Modify css style.

See merge request easycorp/zentaopms!1120
2021-12-23 08:53:50 +00:00
liumengyi e04d64126a * Modify css style. 2021-12-23 16:51:54 +08:00
孙广明 129bf0e524 Merge branch 'sprint/179_zhengrunyu_codecard' into 'master'
*Code english title wrap.

See merge request easycorp/zentaopms!1111
2021-12-23 08:31:05 +00:00
孙广明 146a19fbac Merge branch 'master' into 'sprint/179_sunhao/kanban_ui'
# Conflicts:
#   module/kanban/js/view.js
2021-12-23 06:54:14 +00:00
zhengrunyu ae99db15f2 *Code english title wrap. 2021-12-23 14:40:41 +08:00
Hao Sun bf7da44094 * fix kanban header affix not work in fullscreen mode. 2021-12-23 14:40:39 +08:00
zhengrunyu 571baaccce adjust card color and margin. 2021-12-23 14:25:39 +08:00
Hao Sun f3b3fc93aa * limit kanban card height. 2021-12-23 14:20:13 +08:00
Hao Sun a8d5863b6b * adjust space for kanban layout. 2021-12-23 14:15:15 +08:00
zhengrunyu 5e07624939 *Fix card 2021-12-23 12:00:42 +08:00
Hao Sun 6f30a2c477 * fix text color for column title in kanban. 2021-12-23 11:58:41 +08:00
Hao Sun db17670d31 * Bug #17663, optimize kanban ui on dragging. 2021-12-23 11:09:27 +08:00
李玉春 f281e35958 Merge branch 'sgm_kanbandetail' into 'master'
* Adjust kanban details.

See merge request easycorp/zentaopms!1086
2021-12-23 01:59:18 +00:00
孙广明 3ee3458a3b * Adjust kanban details. 2021-12-23 09:54:56 +08:00
孙广明 31f4e04ad0 * Fix css. 2021-12-23 09:38:37 +08:00
孙广明 6282b7e066 Merge branch 'sprint/179_sunhao/kanban_ui' into 'master'
* Fix kanban columns width.

See merge request easycorp/zentaopms!1073
2021-12-23 01:02:58 +00:00
孙广明 0d36e78c85 * Fix kanban style. 2021-12-22 15:51:17 +08:00
Hao Sun 88544cf4b9 * fix kanban columns width. 2021-12-22 15:41:17 +08:00
liumengyi e454aa2757 * Fix bug #17768. 2021-12-22 14:26:22 +08:00
李玉春 84f2cfb102 Merge branch 'sgm_fixbug' into 'master'
* Finish task #46161.

See merge request easycorp/zentaopms!1059
2021-12-22 02:53:35 +00:00