Commit Graph
96 Commits
Author SHA1 Message Date
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
tianshujie 0601474a78 * Fix bug #18289. 2022-01-10 15:41:24 +08:00
liumengyi 4979f04de9 * Modify style for create card. 2021-12-24 13:31:12 +08:00
孙广明 a28772a3f6 Merge branch 'sprint/179_liumengyi_17927' into 'master'
* Fix bug #17927.

See merge request easycorp/zentaopms!1136
2021-12-24 05:21:55 +00:00
liumengyi 8be143a091 * Fix bug #17927. 2021-12-24 13:20:15 +08:00
zhengrunyu e0b585354d *change position of icon-required. 2021-12-24 13:18:54 +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
孙广明 50315f2bf3 Merge branch 'sprint/179_tianshujie_bug' into 'master'
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1118
2021-12-23 08:15:11 +00:00
李玉春 97d3de7b7e Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17890, #17888.

See merge request easycorp/zentaopms!1115
2021-12-23 08:12:59 +00:00
tianshujie fb1027b47d * Fix bug #17898. 2021-12-23 15:54:41 +08:00
liumengyi 7f2eb13792 * Fix bug for #17894. 2021-12-23 15:50:20 +08: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
孙广明 2b387708f2 Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17882.

See merge request easycorp/zentaopms!1110
2021-12-23 06:29:49 +00:00
tianshujie a9c8d74b72 * Fix bug #17882. 2021-12-23 14:26:46 +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
李玉春 483995dca6 Merge branch 'sgm_46153' into 'master'
* Fix kanban style.

See merge request easycorp/zentaopms!1076
2021-12-22 08:01:49 +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 12b292b157 * Fix bug #17822. 2021-12-22 15:10:45 +08:00
孙广明 5418b47edc Merge branch 'master' into 'sprint/179_liumengyi_fixbug'
# Conflicts:
#   module/kanban/css/space.css
2021-12-22 06:31:37 +00:00
liumengyi e454aa2757 * Fix bug #17768. 2021-12-22 14:26:22 +08:00
孙广明 75a3d20358 Merge branch 'master' into 'sprint/179_tianshujie_46241'
# Conflicts:
#   module/group/lang/resource.php
#   module/kanban/css/space.css
#   module/kanban/js/view.js
2021-12-22 06:03:21 +00:00
孙广明 b282a51d1c Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Finish task #46146.

See merge request easycorp/zentaopms!1064
2021-12-22 05:25:43 +00:00
tianshujie dab44100d5 * Finish task #46241. 2021-12-22 13:16:32 +08:00
liumengyi b355559d0e * Finish task #46146. 2021-12-22 13:10:12 +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
zhengrunyu b5b1fb4d81 *card name warp. 2021-12-22 10:47:29 +08:00
孙广明 08c7f0cc50 * Finish task #46161. 2021-12-22 10:31:43 +08:00
孙广明 3481d14020 Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17724, #17769, #17768, #17765, #17763, #17737.

See merge request easycorp/zentaopms!1045
2021-12-21 09:23:53 +00:00
liumengyi 6b7cbc74ab * Fix bug #17724, #17769, #17768, #17765, #17763, #17737. 2021-12-21 17:16:46 +08:00
tianshujie 7b918d91f0 * Fix bug #17780,#17770,#17760,#17759,#17743. 2021-12-21 16:57:06 +08:00