Commit Graph
131 Commits
Author SHA1 Message Date
liyuchun bddeb2d5b2 * Remove more button in group lane. 2021-11-08 16:50:12 +08:00
holan20180123 30b0c8db07 * Finish task #43938,#43939. 2021-11-07 20:31:28 +08:00
liyuchun a25e86cb59 * Adjust error of kanban action. 2021-11-03 09:15:07 +08:00
李玉春 f011907e1f Merge branch 'sprint/168_sgm_fixvarname' into 'sprint/168'
* Change var name.

See merge request easycorp/zentaopms!281
2021-11-02 06:13:46 +00:00
孙广明 90b6253107 * Fix var name. 2021-11-02 14:12:18 +08:00
李玉春 86c7464aca Merge branch 'sprint/168_sgm_assignpriv' into 'sprint/168'
* Assign btn check priv.

See merge request easycorp/zentaopms!282
2021-11-02 06:09:04 +00:00
孙广明 cc321393f6 * Change var name. 2021-11-02 14:05:53 +08:00
孙广明 c7f0e74517 * Assign btn check priv. 2021-11-02 13:59:41 +08:00
liyuchun 59364de4d8 * Fix bug #15851. 2021-11-02 10:18:44 +08:00
liyuchun fcce47b768 * Fix bug #15852. 2021-11-02 09:48:49 +08:00
liyuchun 84de930ed1 * Fix bug #15853. 2021-11-02 09:27:06 +08:00
李玉春 cb3e573d30 Merge branch 'sprint/168_tianshujie_15902' into 'sprint/168'
* Fix bug #15902.

See merge request easycorp/zentaopms!269
2021-11-02 00:34:38 +00:00
tianshujie 5fc96f394c * Modify format. 2021-11-02 08:19:10 +08:00
tianshujie 5444d35cde * Fix bug #15902. 2021-11-01 17:34:25 +08:00
孙广明 1c98dbd28b Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15887,#15877,#15874.

See merge request easycorp/zentaopms!266
2021-11-01 09:18:16 +00:00
liyuchun 1631791368 * Fix bug #15887,#15877. 2021-11-01 16:54:02 +08:00
孙广明 065b0d04c9 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix bug #15867.

See merge request easycorp/zentaopms!260
2021-11-01 08:30:11 +00:00
xieqiyu 19fca33fa3 * Delete the unused code. 2021-11-01 16:20:01 +08:00
liyuchun d8c96a6430 * Fix bug #15867. 2021-11-01 16:13:13 +08:00
李玉春 16b6f5786e Merge branch 'sprint/168' into 'sprint/168_hufangzhou_43423'
# Conflicts:
#   module/execution/js/kanban.js
#   module/kanban/model.php
2021-11-01 08:12:58 +00:00
李玉春 c118bfe048 更新module/execution/js/kanban.js 2021-11-01 08:05:08 +00:00
孙广明 2b2ec6f202 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix bug #15861.

See merge request easycorp/zentaopms!252
2021-11-01 08:02:42 +00:00
hufangzhou f0349dac2c * Adjust the variable name. 2021-11-01 14:11:21 +08:00
孙广明 4099ac4a20 Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168'
Sprint/168 xieqiyu kanban

See merge request easycorp/zentaopms!253
2021-11-01 05:53:00 +00:00
hufangzhou 702c40addd * Finish task #43423. 2021-11-01 13:50:53 +08:00
liyuchun 7d31524581 * Fix bug #15861. 2021-11-01 13:45:43 +08:00
dingna c28e4c1b61 * Fix code for task#43401,#43403,#43404,#43405,#43398,#43399. 2021-11-01 13:26:57 +08:00
xieqiyu c08c981ab0 * Display the sub Lane view kanban. 2021-11-01 13:13:56 +08:00
liyuchun 970763b0c5 * Adjust create object in kanban. 2021-11-01 11:32:21 +08: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
李玉春 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