 xieqiyu
|
d5914e8ffc
|
* Conflict resolution.
|
2021-10-29 14:12:07 +08:00 |
|
|
liyuchun
|
85b0c18495
|
Merge branch 'sprint/168_dingna_task_43401' into sprint/168
|
2021-10-29 13:51:04 +08: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 |
|
|
李玉春
|
56b529d7d8
|
Merge branch 'sprint/168_sunhao/kanban_icons' into 'sprint/168'
* Add icons for kanban.
See merge request easycorp/zentaopms!228
|
2021-10-29 05:45:08 +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 |
|
|
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 |
|
|
李玉春
|
50fbd8a1a1
|
Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
rename kanban common
See merge request easycorp/zentaopms!230
|
2021-10-29 05:18:23 +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 |
|
|
Hao Sun
|
23c6b5c347
|
* add icons for kanban by update zui.
|
2021-10-29 11:20:37 +08: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
|
eaadf27fd1
|
* fix kanban not work in product or project page.
|
2021-10-29 10:36:19 +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 |
|
|
李玉春
|
e2e9eb721d
|
Merge branch 'sprint/168_sgm_assignto' into 'sprint/168'
* Add link to assignto.
See merge request easycorp/zentaopms!224
|
2021-10-29 02:34:31 +00: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 |
|
|
孙广明
|
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 |
|
|
xieqiyu
|
6035a7f700
|
* Add data to the Kanban lane table.
|
2021-10-28 17:24:20 +08:00 |
|
|
李玉春
|
2da2792c0a
|
Merge branch 'sprint/168_tianshujie_43416' into 'sprint/168'
* Add card sorting logic.
See merge request easycorp/zentaopms!218
|
2021-10-28 09:20:16 +00:00 |
|
|
tianshujie
|
8ae7fec1de
|
* Edit comment of kanban control.
|
2021-10-28 17:18:33 +08:00 |
|
|
tianshujie
|
ac5bda3929
|
* Revert conflicting codes.
|
2021-10-28 17:16:42 +08:00 |
|
|
tianshujie
|
4472d176d9
|
* Add comment of kanban control.
|
2021-10-28 17:10:54 +08:00 |
|
|
tianshujie
|
34d7a4eb00
|
* Add card sorting logic.
|
2021-10-28 17:00:51 +08:00 |
|
|
李玉春
|
936ae57bff
|
Merge branch 'sprint/168_sgm_fix_detail' into 'sprint/168'
* Fix create story action error.
See merge request easycorp/zentaopms!214
|
2021-10-28 08:52:44 +00:00 |
|
|
孙广明
|
97f883c3b2
|
Merge branch 'sprint/168_zenggang_15773' into 'sprint/168'
* Fix bug#15773
See merge request easycorp/zentaopms!198
|
2021-10-28 08:36:36 +00:00 |
|
|
李玉春
|
3fabdeaa88
|
Merge branch 'sprint/168_sunhao/improve_contextmenu' into 'sprint/168'
* Improve contextmenu, support for custom attrs for menu items.
See merge request easycorp/zentaopms!215
|
2021-10-28 08:25:23 +00:00 |
|
|
liyuchun
|
817178e93b
|
* Add button of set WIP and column name.
|
2021-10-28 16:19:16 +08:00 |
|
|
Hao Sun
|
fcbe1cb9cc
|
* improve contextmenu, support for custom attrs for menu items.
|
2021-10-28 16:14:57 +08:00 |
|
|
zenggang
|
c061aac0e1
|
* Adjust code style
|
2021-10-28 07:56:24 +00:00 |
|