 孙广明
|
83f3079804
|
* Finish task #43393.
|
2021-10-28 11:01:50 +08:00 |
|
|
李玉春
|
6a8f69b524
|
Merge branch 'sprint/168_sgm_adjustcode' into 'sprint/168'
* Adjust code style.
See merge request easycorp/zentaopms!196
|
2021-10-28 01:37:15 +00:00 |
|
|
李玉春
|
1632e807af
|
Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
fix unique lane column name
See merge request easycorp/zentaopms!195
|
2021-10-28 01:33:59 +00:00 |
|
|
xiawenlong
|
1520ef7ddf
|
fix code style
|
2021-10-28 09:32:40 +08:00 |
|
|
xiawenlong
|
6767ddb22f
|
fix code style
|
2021-10-28 09:32:07 +08:00 |
|
|
孙广明
|
ef415555ef
|
* Adjust code style.
|
2021-10-28 09:29:34 +08:00 |
|
|
xiawenlong
|
f6517fdc01
|
fix code style
|
2021-10-28 09:25:23 +08:00 |
|
|
xiawenlong
|
f6f3eea052
|
fix code style
|
2021-10-28 08:56:48 +08:00 |
|
|
xiawenlong
|
4b760d9837
|
fix unique lane column name
|
2021-10-28 08:50:26 +08:00 |
|
|
孙广明
|
77124bcb9f
|
Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix error of kanban.
See merge request easycorp/zentaopms!194
|
2021-10-28 00:40:23 +00:00 |
|
|
李玉春
|
5357edda36
|
Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168'
*Sprint/168 tianshujie kanban
See merge request easycorp/zentaopms!191
|
2021-10-28 00:36:40 +00:00 |
|
|
liyuchun
|
f361a97721
|
* Fix error of kanban.
|
2021-10-28 08:35:21 +08:00 |
|
|
孙广明
|
b6cc57c54e
|
Merge branch 'spirnt/168_liyuchun_43409' into 'sprint/168'
* Finish task #43521.
See merge request easycorp/zentaopms!193
|
2021-10-27 09:27:49 +00:00 |
|
|
liyuchun
|
1981133d03
|
* Finish task #43521.
|
2021-10-27 17:17:45 +08:00 |
|
|
tianshujie
|
ceefa34752
|
* Modify to get card data.
|
2021-10-27 17:14:37 +08:00 |
|
|
孙广明
|
c749aeb0cb
|
Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
Finish Task #43407,43420
See merge request easycorp/zentaopms!188
|
2021-10-27 09:03:25 +00:00 |
|
|
xiawenlong
|
1bd4afcd24
|
* Finish Task #43407,43420
|
2021-10-27 16:53:31 +08:00 |
|
|
xiawenlong
|
5b0458b841
|
* Finish Task #43407,43420
|
2021-10-27 16:53:15 +08:00 |
|
|
李玉春
|
e72ae4fa18
|
Merge branch 'sprint/168_sgm_kanban' into 'sprint/168'
* Finish task #43394, #43395, #43396.
See merge request easycorp/zentaopms!187
|
2021-10-27 08:48:55 +00:00 |
|
|
孙广明
|
81603f04bd
|
* Finish task #43394, #43395, #43396.
|
2021-10-27 16:40:30 +08:00 |
|
|
李玉春
|
2204b280f1
|
Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168'
* Modify query Kanban logic.
See merge request easycorp/zentaopms!183
|
2021-10-27 07:51:25 +00:00 |
|
|
tianshujie
|
af47fbde25
|
* Modify the parent swimlane column data.
|
2021-10-27 15:47:53 +08:00 |
|
|
孙广明
|
be167bcafb
|
Merge branch 'sprint/168_liyuchun_43424' into 'sprint/168'
* Finish task #43519,#43503.
See merge request easycorp/zentaopms!185
|
2021-10-27 07:46:11 +00:00 |
|
|
tianshujie
|
d6d04e1152
|
* Modify the parent lane column data.
|
2021-10-27 15:45:01 +08:00 |
|
|
liyuchun
|
d0b9dda4d7
|
* Finish task #43519,#43503.
|
2021-10-27 15:41:36 +08:00 |
|
|
tianshujie
|
6f72de9b65
|
* Modify query Kanban logic.
|
2021-10-27 15:34:59 +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 |
|
|
liyuchun
|
8997b3d141
|
Merge branch 'sprint/167_sgm_kanbandata' into sprint/168
|
2021-10-27 15:07:06 +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
|
7e8d65f34e
|
* fix window.columnRenderers works with defaultCardType.
|
2021-10-27 14:53:45 +08:00 |
|
|
Hao Sun
|
81ad2610dc
|
* refactor: alignment statements.
|
2021-10-27 14:53:15 +08:00 |
|
|
孙广明
|
1dd7098228
|
Merge branch 'sprint/168_xiawenlong' into sprint/168
|
2021-10-27 14:51:12 +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 |
|
|
孙广明
|
1d75b28c4d
|
Merge branch 'sprint/168_sunhao/improve_kanban_ui' into 'sprint/168'
* Improve UI for kanban page, adjust page layout and support for dnd.
See merge request easycorp/zentaopms!175
|
2021-10-27 06:30:31 +00:00 |
|
|
Hao Sun
|
b4631b3665
|
* add drag and drop animation to kanban.
|
2021-10-27 14:28:03 +08:00 |
|
|
xiawenlong
|
19d91de64c
|
* Finish Task #43420
|
2021-10-27 14:23:28 +08:00 |
|
|
xiawenlong
|
f1fd0ee1db
|
* Finish Task #43420
|
2021-10-27 14:14:50 +08:00 |
|
|
Hao Sun
|
b9ce9d697f
|
* support for d-n-d in kanban.
|
2021-10-27 14:08:22 +08:00 |
|
|
Hao Sun
|
f3b29388f7
|
* adjust layout for kanban page.
|
2021-10-27 13:52:27 +08:00 |
|
|
孙广明
|
e623a13cb2
|
Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
add right actions
See merge request easycorp/zentaopms!173
|
2021-10-27 05:37:43 +00:00 |
|
|
xiawenlong
|
b571de52de
|
add right actions
|
2021-10-27 11:46:54 +08:00 |
|
|
朱金勇
|
57995a6e7f
|
Merge branch 'sprint/168_sunhao/refactor_avatar_helper' into 'sprint/168'
* Refactor avatar helper, the $user param cannot be an avatar url now.
See merge request easycorp/zentaopms!161
|
2021-10-27 03:01:59 +00:00 |
|
|
李玉春
|
0af76bd862
|
Merge branch 'sprint/168_sgm_43396' into 'sprint/168'
* Add bind product action.
See merge request easycorp/zentaopms!166
|
2021-10-27 02:55:51 +00:00 |
|
|
孙广明
|
15fcbf79e8
|
Merge branch 'sprint/168_liyuchun_43503' into 'sprint/168'
Sprint/168 liyuchun 43503
See merge request easycorp/zentaopms!171
|
2021-10-27 02:46:22 +00:00 |
|
|
liyuchun
|
d7868c41e3
|
* Code for task #43503.
|
2021-10-27 10:38:52 +08:00 |
|
|
liyuchun
|
c0502c85fd
|
* Code for task #43503.
|
2021-10-27 10:35:51 +08:00 |
|