Commit Graph
24587 Commits
Author SHA1 Message Date
hufangzhou f0349dac2c * Adjust the variable name. 2021-11-01 14:11:21 +08:00
hufangzhou 702c40addd * Finish task #43423. 2021-11-01 13:50:53 +08:00
李玉春 b5532e7379 Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168'
* Add a default color to the kanban column.

See merge request easycorp/zentaopms!239
2021-10-29 07:15:20 +00:00
李玉春 1187d1cb81 Merge branch 'sprint/168' into 'sprint/168_dingna_enlang'
# Conflicts:
#   module/kanban/lang/zh-cn.php
2021-10-29 07:10:27 +00:00
tianshujie 70349fe46a * Add a default color to the kanban column. 2021-10-29 15:05:33 +08:00
孙广明 06feb0f942 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix error of save WIP.

See merge request easycorp/zentaopms!240
2021-10-29 07:04:08 +00:00
孙广明 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
tianshujie bf032684e4 * Add a default color to the kanban column. 2021-10-29 14:49:17 +08:00
liyuchun dfc29b5cb2 * Fix error of save WIP. 2021-10-29 14:48:38 +08:00
dingna e352053c76 * Fix language items. 2021-10-29 14:37:35 +08:00
李玉春 2e8baf8959 Merge branch 'sprint/168_dingna_merge' into 'sprint/168'
* Conflict resolution.

See merge request easycorp/zentaopms!235
2021-10-29 06:16:03 +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
xieqiyu d5914e8ffc * Conflict resolution. 2021-10-29 14:12:07 +08: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
dingna 6369e0f7a3 * Fix an error. 2021-10-29 13:37:03 +08:00
孙广明 8ef42ffc5c Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Finish task #43407,#43406.

See merge request easycorp/zentaopms!231
2021-10-29 05:34:32 +00:00
zenggang d84ffbd355 * Adjust code format 2021-10-29 05:31:26 +00:00
xiawenlong 36f9e95c4f rename kanban common 2021-10-29 13:16:38 +08: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
xieqiyu 0c5c8e2a42 * Modify code logic. 2021-10-29 11:33:19 +08:00
zenggang ce7c632045 * Change function name 2021-10-29 03:29:08 +00: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 1e39ba869a * remove product card shadow. 2021-10-29 10:36:00 +08:00
Hao Sun e90026232a * refactor. 2021-10-29 10:35:45 +08:00
夏文龙 a0a4af4daa Update kanban.html.php 2021-10-29 02:33:45 +00:00
xiawenlong f74435a42d fix code style 2021-10-29 10:26:34 +08:00
xieqiyu 6d701ebc81 * Add data to the Kanban column database table. 2021-10-29 10:14:50 +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
李玉春 2e6faf1373 Merge branch 'sprint/168_tianshujie_43416' into 'sprint/168'
* Increase the card sorting judgment of the parent lane column.

See merge request easycorp/zentaopms!221
2021-10-29 01:54:48 +00:00
tianshujie 726529bdb9 * Modify the sort logic of the lane column by field. 2021-10-29 09:49:56 +08:00
dingna 02647a91a4 * Code update again for #43401,#43507,#43398. 2021-10-29 09:48:26 +08:00
孙广明 37e96eebe7 Merge branch 'sprint/168_liyuchun_43519' into 'sprint/168'
* Finish task #43519.

See merge request easycorp/zentaopms!219
2021-10-29 01:42:47 +00:00
liyuchun 7a208ad404 * Adjust task $43519. 2021-10-29 09:41:09 +08:00
tianshujie 7f9f5e5649 * Increase the card sorting judgment of the parent lane column. 2021-10-29 09:32:56 +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