Commit Graph
652 Commits
Author SHA1 Message Date
孙广明 4c91b03239 Merge branch 'sprint/168_zenggang_tasks' into 'sprint/168'
* Finish task#43410,43411,43413

See merge request easycorp/zentaopms!227
2021-10-29 07:03:13 +00:00
李玉春 188d3fa8d9 Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
fix fullscreen bug

See merge request easycorp/zentaopms!233
2021-10-29 06:15:26 +00:00
李玉春 619b95257c 更新module/execution/js/kanban.js 2021-10-29 06:15:03 +00:00
xiawenlong 92632bc105 fix fullscreen bug 2021-10-29 14:04:15 +08:00
李玉春 1970b04106 Merge branch 'sprint/168_sunhao/kanban_dnd' into 'sprint/168'
* Add method to handle dnd action in kanban.

See merge request easycorp/zentaopms!184
2021-10-29 05:53:40 +00:00
李玉春 8ce1a694fc Merge branch 'sprint/168' into 'sprint/168_dingna_task_43401'
# Conflicts:
#   module/execution/control.php
#   module/execution/view/kanban.html.php
#   module/kanban/lang/zh-cn.php
#   module/kanban/model.php
2021-10-29 05:50:12 +00:00
李玉春 44ad6d63a4 Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168'
* Fix kanban not work in program, product or project page.

See merge request easycorp/zentaopms!225
2021-10-29 05:44:50 +00:00
zenggang 5744e27e52 * Adjust code 2021-10-29 05:43:28 +00:00
Hao Sun 0e1910bf9a * fix limit count not show as expected in kanban. 2021-10-29 13:39:01 +08:00
zenggang d84ffbd355 * Adjust code format 2021-10-29 05:31:26 +00:00
dingna ddffca8d41 * Fix an error. 2021-10-29 13:14:53 +08:00
liyuchun 4f56cc8c0f * Finish task #43407,#43406. 2021-10-29 12:37:59 +08:00
dingna 0fac3aa189 * Adjust Code for task#43401,#43403,#43404,#43405,#43398,#43399. 2021-10-29 11:33:47 +08:00
zenggang 6bdf89c293 * Finish task#43410,43411,43413 2021-10-29 03:18:10 +00:00
dingna 5217e0dfc2 * Adjust code style. 2021-10-29 10:44:28 +08:00
李玉春 e618b57d12 Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
add permission

See merge request easycorp/zentaopms!223
2021-10-29 02:43:44 +00:00
liyuchun 54bb24823f * Delete unused code. 2021-10-29 10:42:27 +08:00
Hao Sun e90026232a * refactor. 2021-10-29 10:35:45 +08:00
xiawenlong 5397954f15 Finish permissionOC 2021-10-29 10:13:39 +08:00
xiawenlong 3dc8358434 Finish permissionOC 2021-10-29 10:09:07 +08:00
孙广明 cdfb230005 * Add link to assignto. 2021-10-29 10:07:59 +08:00
dingna 02647a91a4 * Code update again for #43401,#43507,#43398. 2021-10-29 09:48:26 +08:00
dingna 0b13f86812 * Code update for task * 43401,#43507,#43398. 2021-10-29 09:23:53 +08:00
xieqiyu 04b34ce724 * Adjust code style. 2021-10-29 08:56:58 +08:00
dingna 87c6365aee * Code for task#43401,#43507,#43398. 2021-10-29 08:43:06 +08:00
孙广明 3b11423f2f Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Add button of set WIP and column name.

See merge request easycorp/zentaopms!216
2021-10-29 00:39:22 +00:00
liyuchun 817178e93b * Add button of set WIP and column name. 2021-10-28 16:19:16 +08:00
孙广明 faeef62b5c * Fix create story action error. 2021-10-28 15:15:17 +08:00
李玉春 f9b40d2887 Merge branch 'sprint/168' into 'sprint/168_sgm_43393'
# Conflicts:
#   module/execution/js/kanban.js
2021-10-28 06:47:11 +00:00
Hao Sun 4dadfbd558 * add actions button to cards. 2021-10-28 11:49:27 +08:00
Hao Sun 34064d70b0 * support for using contextmenu in kanban. 2021-10-28 11:34:46 +08:00
Hao Sun 7cf59f0e13 * support for using iframe modal in kanban page. 2021-10-28 11:31:50 +08:00
Hao Sun e26a26f934 * show deadline on task and bug card. 2021-10-28 11:30:58 +08:00
孙广明 83f3079804 * Finish task #43393. 2021-10-28 11:01:50 +08:00
孙广明 ef415555ef * Adjust code style. 2021-10-28 09:29:34 +08:00
孙广明 81603f04bd * Finish task #43394, #43395, #43396. 2021-10-27 16:40:30 +08:00
Hao Sun f02082212c * add changeCardColType method. 2021-10-27 15:41:35 +08:00
Hao Sun f2cf07b71d Merge branch 'sprint/168_sunhao/kanban_refactor' into sprint/168
# Conflicts:
#	module/execution/js/kanban.js
2021-10-27 15:20:45 +08:00
Hao Sun 4afd15a4fe * Fix merge conflict. 2021-10-27 15:20:03 +08:00
李玉春 5822a06c7d Merge branch 'sprint/168' into 'sprint/167_sgm_kanbandata'
# Conflicts:
#   module/kanban/model.php
2021-10-27 07:05:51 +00:00
Hao Sun e403896809 * avoid override window.kanbanDropRules settings in other place. 2021-10-27 15:03:51 +08:00
Hao Sun 81ad2610dc * refactor: alignment statements. 2021-10-27 14:53:15 +08:00
Hao Sun 37f88fdd83 * refactor: rename maxCount->limit, item -> card and comment. 2021-10-27 14:50:32 +08:00
孙广明 8bfa8d5a42 * Add get kanban group. 2021-10-27 14:50:13 +08:00
孙广明 0fc3731113 Merge branch 'sprint/168' into 'sprint/168_xiawenlong'
# Conflicts:
#   module/execution/js/kanban.js
2021-10-27 06:48:39 +00:00
xiawenlong 19d91de64c * Finish Task #43420 2021-10-27 14:23:28 +08:00
Hao Sun b9ce9d697f * support for d-n-d in kanban. 2021-10-27 14:08:22 +08:00
Hao Sun 14d45f2939 * move some code from kanban_demo. 2021-10-26 16:59:24 +08:00
Hao Sun 77d4073869 * improve avatar style in kanban. 2021-10-26 16:57:36 +08:00
孙广明 ad05f1d4cf * Add kanban view. 2021-10-26 15:03:27 +08:00