Commit Graph
31804 Commits
Author SHA1 Message Date
Hao Sun bf7da44094 * fix kanban header affix not work in fullscreen mode. 2021-12-23 14:40: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
Hao Sun af81e6bb78 * enable kanban sortable in fullscreen mode. 2021-12-23 13:51:44 +08:00
Hao Sun 167224d677 * optimize UI for d-n-d in kanban. 2021-12-23 13:47:39 +08:00
Hao Sun 6f30a2c477 * fix text color for column title in kanban. 2021-12-23 11:58:41 +08:00
Hao Sun 38ed6e4222 * fix variable name. 2021-12-23 11:58:06 +08:00
Hao Sun db17670d31 * Bug #17663, optimize kanban ui on dragging. 2021-12-23 11:09:27 +08:00
孙广明 2528270fe1 Merge branch 'sprint/178_songchenxuan_46100' 2021-12-23 10:46:31 +08:00
孙广明 7bdb0499e9 Merge branch 'master' into 'sprint/178_songchenxuan_46100'
# Conflicts:
#   module/productplan/view/batchedit.html.php
#   module/productplan/view/browse.html.php
2021-12-23 02:46:03 +00:00
孙广明 c9c8dd72eb Merge branch 'sprint/179_tianshuje_46242' into 'master'
Sprint/179 tianshuje 46242

See merge request easycorp/zentaopms!1089
2021-12-23 02:38:16 +00:00
tianshujie 52259ab836 * Optimize the details. 2021-12-23 10:28:34 +08:00
songchenxuan 1d7882d51f *Finish task #46100. 2021-12-23 10:06:54 +08:00
tianshujie 25a2e79f43 * Finish task #46242. 2021-12-23 09:59:34 +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
孙广明 b948b51841 Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix the bug caused by personnel deletion.

See merge request easycorp/zentaopms!1085
2021-12-23 01:55:38 +00:00
孙广明 3ee3458a3b * Adjust kanban details. 2021-12-23 09:54:56 +08:00
李玉春 a89a51deec Merge branch 'sgm_fixbug' into 'master'
* Fix css.

See merge request easycorp/zentaopms!1084
2021-12-23 01:41:25 +00:00
liumengyi 04c61d1205 * Fix the bug caused by personnel deletion. 2021-12-23 09:39:37 +08:00
孙广明 2a322567cc Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17822.

See merge request easycorp/zentaopms!1082
2021-12-23 01:39:19 +00:00
孙广明 31f4e04ad0 * Fix css. 2021-12-23 09:38:37 +08:00
songchenxuan c0e1f91e9a *Finish task #46100. 2021-12-23 09:29:34 +08:00
liumengyi 0a689661f2 * Fix bug #17822. 2021-12-23 09:20:40 +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
songchenxuan 055df23f69 *Finish task #46100. 2021-12-22 17:32:44 +08: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
孙广明 b8cd9a28dd Merge branch 'sprint/179_zhengrunyu_fixbug' 2021-12-22 15:51:42 +08:00
孙广明 0d36e78c85 * Fix kanban style. 2021-12-22 15:51:17 +08:00
孙广明 453145af31 Merge branch 'master' into 'sprint/179_zhengrunyu_fixbug'
# Conflicts:
#   module/kanban/js/view.js
2021-12-22 07:51:02 +00:00
孙广明 ea15a6c2ed Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17822.

See merge request easycorp/zentaopms!1068
2021-12-22 07:49:57 +00:00
孙广明 ded871aa6f Merge branch 'sprint/31_zhouxin_17711' into 'master'
Sprint/31 zhouxin 17711

See merge request easycorp/zentaopms!1066
2021-12-22 07:49:40 +00:00
孙广明 83c8385b69 Merge branch 'sprint/31_zhouxin_17665' into 'master'
Fix bug #17665.

See merge request easycorp/zentaopms!1074
2021-12-22 07:48:35 +00:00
zhouxin 18383e225b Fix bug #17665. 2021-12-22 07:44:26 +00:00
Hao Sun 88544cf4b9 * fix kanban columns width. 2021-12-22 15:41:17 +08:00
孙广明 6b9751f78e Merge branch 'sprint/178_mayue_46098' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!1071
2021-12-22 07:37:29 +00:00
zhengrunyu 7578906006 *change avater show. 2021-12-22 15:36:36 +08:00
mayue 5da1b391cc * Optimize code. 2021-12-22 15:35:16 +08:00
liumengyi 12b292b157 * Fix bug #17822. 2021-12-22 15:10:45 +08:00
孙广明 edcd625b35 Merge branch 'sprint/179_liumengyi_fixbug' 2021-12-22 14:32:22 +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
songchenxuan a7258e471b *Finish task #46100. 2021-12-22 14:28:28 +08:00
liumengyi e454aa2757 * Fix bug #17768. 2021-12-22 14:26:22 +08:00
zhouxin d0eb0e8662 Fix bug #17711. 2021-12-22 06:09:36 +00:00
孙广明 bb9171d6ba Merge branch 'sprint/179_tianshujie_46241' 2021-12-22 14:05:03 +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
zhouxin 32bb53370c Fix bug #17711. 2021-12-22 06:01:35 +00:00
tianshujie 0c5b069581 * Modify file comment. 2021-12-22 13:52:51 +08:00
tianshujie 84e368ccab * Adjust Kanban permissions. 2021-12-22 13:48:47 +08: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
liumengyi 62be3e024e * Remove unwanted code. 2021-12-22 13:16:42 +08:00