 tianshujie
|
4e9b6f7298
|
Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/177_tianshujie_close
|
2021-12-15 13:32:09 +08:00 |
|
|
孙广明
|
24298b5d24
|
Merge branch 'sgm_kanbandetail' into kanban
|
2021-12-15 13:21:34 +08:00 |
|
|
孙广明
|
78345e3785
|
Merge branch 'kanban' into 'sgm_kanbandetail'
# Conflicts:
# module/kanban/js/view.js
# module/kanban/lang/en.php
# module/kanban/model.php
# module/kanban/view/createcard.html.php
# module/kanban/view/createcolumn.html.php
# module/kanban/view/viewcard.html.php
|
2021-12-15 05:20:45 +00:00 |
|
|
孙广明
|
0ab00d2037
|
* Code details.
|
2021-12-15 13:13:07 +08:00 |
|
|
tianshujie
|
66174b2341
|
* Add close space function.
|
2021-12-15 11:31:02 +08:00 |
|
|
孙广明
|
4293ca8714
|
Merge branch 'sprint/kanban_tanghucheng_stage' into 'kanban'
* Code for stage.
See merge request easycorp/zentaopms!953
|
2021-12-15 03:20:05 +00:00 |
|
|
孙广明
|
e17aa6f3f7
|
Merge branch 'sprint/177_tianshujie_card' into 'kanban'
* Modify and create card style.
See merge request easycorp/zentaopms!952
|
2021-12-15 03:15:34 +00:00 |
|
|
tanghucheng
|
d97494e257
|
* Code for stage.
|
2021-12-15 11:14:15 +08:00 |
|
|
tianshujie
|
9cc52b4169
|
* Modify and create card style.
|
2021-12-15 11:13:17 +08:00 |
|
|
孙广明
|
0641d7db15
|
Merge branch 'sprint/177_liumengyi_17538' into 'kanban'
* Fix bug #17538.
See merge request easycorp/zentaopms!951
|
2021-12-15 02:53:09 +00:00 |
|
|
liumengyi
|
4050299015
|
* Fix bug #17538.
|
2021-12-15 10:51:42 +08:00 |
|
|
孙广明
|
d7646afa83
|
Merge branch 'sprint/177_tianshujie_kanban' into 'kanban'
* Modify the team drop-down pop-up method.
See merge request easycorp/zentaopms!950
|
2021-12-15 02:46:13 +00:00 |
|
|
孙广明
|
dce707c7b9
|
Merge branch 'sprint/177_tianshujie_kanban' into 'kanban'
* Fix the issue of viewing card permissions.
See merge request easycorp/zentaopms!946
|
2021-12-15 02:43:35 +00:00 |
|
|
tianshujie
|
3e5427789f
|
* Modify the team drop-down pop-up method.
|
2021-12-15 10:43:35 +08:00 |
|
|
孙广明
|
0d35e96baf
|
Merge branch 'sprint/177_liumengyi_setlane' into 'kanban'
* Fix bug #17537,#17542.
See merge request easycorp/zentaopms!948
|
2021-12-15 02:37:07 +00:00 |
|
|
孙广明
|
317fc9c3a9
|
Merge branch 'sprint/177_zhengrunyu_fixbug' into 'kanban'
*Fix bug
See merge request easycorp/zentaopms!949
|
2021-12-15 02:36:03 +00:00 |
|
|
tianshujie
|
0d09364ee2
|
* Fix bug #17540.
|
2021-12-15 10:34:03 +08:00 |
|
|
liumengyi
|
085846cb48
|
* Add judgment conditions.
|
2021-12-15 10:25:27 +08:00 |
|
|
zhengrunyu
|
57474fce26
|
*Fix bug
|
2021-12-15 10:23:33 +08:00 |
|
|
tianshujie
|
72739ca937
|
* Fix bug #17546.
|
2021-12-15 10:22:01 +08:00 |
|
|
liumengyi
|
1de91f9c04
|
* Fix bug #17537,#17542.
|
2021-12-15 10:20:14 +08:00 |
|
|
孙广明
|
610d12a632
|
* Code for card info.
|
2021-12-15 10:10:20 +08:00 |
|
|
liumengyi
|
f1289a8d1a
|
* Modify set wip method.
|
2021-12-15 10:10:20 +08:00 |
|
|
tanghucheng
|
9096817ac5
|
* Fix bug #17535.
|
2021-12-15 10:10:20 +08:00 |
|
|
tianshujie
|
6b3bd72ef1
|
* Fix card details style.
|
2021-12-15 10:10:20 +08:00 |
|
|
tianshujie
|
c6538afacc
|
* Fix the display error of the board.
|
2021-12-15 10:10:20 +08:00 |
|
|
孙广明
|
530e7e55b0
|
* Merge code.
|
2021-12-15 10:10:11 +08:00 |
|
|
tianshujie
|
ca272d7979
|
* Add title attribute.
|
2021-12-15 10:01:46 +08:00 |
|
|
tianshujie
|
58e48d0e5f
|
* Fix the issue of viewing card permissions.
|
2021-12-15 09:50:06 +08:00 |
|
|
孙广明
|
54ac398d46
|
Merge branch 'sprint/177_tianshujie_cardview' into 'kanban'
* Fix card details style.
See merge request easycorp/zentaopms!943
|
2021-12-15 01:09:17 +00:00 |
|
|
孙广明
|
f5bbd8f3ec
|
Merge branch 'sprint/177_liumengyi_fixbug' into 'kanban'
* Modify set wip method.
See merge request easycorp/zentaopms!945
|
2021-12-15 01:07:08 +00:00 |
|
|
孙广明
|
38560244bf
|
Merge branch 'sprint/kanban_tanghucheng_17535' into 'kanban'
* Fix bug #17535.
See merge request easycorp/zentaopms!942
|
2021-12-15 01:03:08 +00:00 |
|
|
liumengyi
|
7feb83733d
|
* Modify set wip method.
|
2021-12-15 09:01:33 +08:00 |
|
|
tanghucheng
|
9a06198494
|
* Fix bug #17535.
|
2021-12-14 19:02:48 +08:00 |
|
|
tianshujie
|
498ea23823
|
* Fix card details style.
|
2021-12-14 17:24:03 +08:00 |
|
|
孙广明
|
ecc4dafe0d
|
Merge branch 'sprint/177_tianshujie_cardview' into 'kanban'
* Fix the display error of the board.
See merge request easycorp/zentaopms!940
|
2021-12-14 09:10:37 +00:00 |
|
|
tianshujie
|
8974e7080b
|
* Fix the display error of the board.
|
2021-12-14 17:07:03 +08:00 |
|
|
孙广明
|
fcf709a7b4
|
Merge branch 'sprint/177_tianshujie_card' into 'kanban'
* Finish task #45828.
See merge request easycorp/zentaopms!937
|
2021-12-14 08:48:27 +00:00 |
|
|
tianshujie
|
1a3883325b
|
* Finish task #45828.
|
2021-12-14 16:45:03 +08:00 |
|
|
孙广明
|
6ea815f13e
|
* Fix create card view.
|
2021-12-14 16:22:24 +08:00 |
|
|
孙广明
|
da93f52918
|
Merge branch 'sgm_displaycard' into kanban
|
2021-12-14 15:43:52 +08:00 |
|
|
孙广明
|
1811c641de
|
Merge branch 'sgm_displaycard' into kanban
|
2021-12-14 15:21:11 +08:00 |
|
|
孙广明
|
750184ff08
|
Merge branch 'kanban' into 'sgm_displaycard'
# Conflicts:
# module/kanban/control.php
# module/kanban/lang/en.php
# module/kanban/model.php
# module/kanban/view/createcard.html.php
|
2021-12-14 07:20:58 +00:00 |
|
|
孙广明
|
08cb4bea97
|
* Code details.
|
2021-12-14 15:13:37 +08:00 |
|
|
孙广明
|
3227fe3a9b
|
Merge branch 'sprint/177_zhengrunyu_' into 'kanban'
*Fix bug
See merge request easycorp/zentaopms!933
|
2021-12-14 06:55:30 +00:00 |
|
|
zhengrunyu
|
59eea3a8d3
|
*fix
|
2021-12-14 14:54:19 +08:00 |
|
|
孙广明
|
2c12c5ec43
|
Merge branch 'sprint/177_tianshujie_kanban' into 'kanban'
Optimize permissions
See merge request easycorp/zentaopms!935
|
2021-12-14 06:52:59 +00:00 |
|
|
孙广明
|
02227a8831
|
Merge branch 'sprint/177_liumengyi_17510' into 'kanban'
* Fix bug #17510.
See merge request easycorp/zentaopms!930
|
2021-12-14 06:46:50 +00:00 |
|
|
孙广明
|
66c268f186
|
* Fix js code.
|
2021-12-14 14:45:24 +08:00 |
|
|
liumengyi
|
3b377beba4
|
* Modify style for create lane.
|
2021-12-14 14:44:27 +08:00 |
|