 孙广明
|
d7e951d26a
|
Merge branch 'sprint/179_liumengyi_46150' into 'kanban'
* Finish task #46150.
See merge request easycorp/zentaopms!964
|
2021-12-16 00:41:42 +00:00 |
|
|
liumengyi
|
31f8a27fa6
|
* Remove unwanted code.
|
2021-12-16 08:41:07 +08:00 |
|
|
孙广明
|
e5458fe55e
|
Merge branch 'sprint/179_zhengrunyu_46159' into 'kanban'
*fix bug.
See merge request easycorp/zentaopms!965
|
2021-12-16 00:38:39 +00:00 |
|
|
zhengrunyu
|
244a4b4bdd
|
*fix bug.
|
2021-12-16 08:37:24 +08:00 |
|
|
liumengyi
|
a1be35b2a1
|
* Finish task #46150.
|
2021-12-15 17:46:58 +08:00 |
|
|
liumengyi
|
4716224337
|
* Finish task #46150.
|
2021-12-15 17:46:30 +08:00 |
|
|
王怡栋
|
7c042816d5
|
Merge branch 'sgm_viewcard' into 'kanban'
* Fix card bug.
See merge request easycorp/zentaopms!963
|
2021-12-15 09:13:54 +00:00 |
|
|
孙广明
|
ecd813ee37
|
* Fix card bug.
|
2021-12-15 17:10:00 +08:00 |
|
|
孙广明
|
0d43d5ee81
|
Merge branch 'sprint/179_liumengyi_region' into 'kanban'
* Modify the deletion prompt of lane, column and card.
See merge request easycorp/zentaopms!961
|
2021-12-15 08:30:55 +00:00 |
|
|
liumengyi
|
a6c87dec8a
|
* Modify close html files.
|
2021-12-15 16:29:04 +08:00 |
|
|
liumengyi
|
925919f913
|
* Modify the deletion prompt of lane, column and card.
|
2021-12-15 16:25:35 +08:00 |
|
|
李玉春
|
387466f7f0
|
Merge branch 'sprint/30_zhouxin_bug_17508' into 'kanban'
Fix bug #17508.
See merge request easycorp/zentaopms!960
|
2021-12-15 07:44:31 +00:00 |
|
|
zhouxin
|
d1f43a5025
|
Fix bug #17508.
|
2021-12-15 07:31:04 +00:00 |
|
|
孙广明
|
b99a5f0ff7
|
Merge branch 'sprint/177_zhengrunyu_close' into 'kanban'
Sprint/177 zhengrunyu close
See merge request easycorp/zentaopms!958
|
2021-12-15 06:54:34 +00:00 |
|
|
孙广明
|
2172937d50
|
Merge branch 'sprint/177_liumengyi_delete' into 'kanban'
* Add space, Kanban and region deletion methods.
See merge request easycorp/zentaopms!957
|
2021-12-15 06:51:57 +00:00 |
|
|
zhengrunyu
|
d236164410
|
*add delete lane and column.
|
2021-12-15 14:51:31 +08:00 |
|
|
liumengyi
|
d0a4a17fd9
|
* Modify judgment conditions.
|
2021-12-15 14:48:31 +08:00 |
|
|
zhengrunyu
|
9f37454e8f
|
*close lane and column.
|
2021-12-15 14:46:10 +08:00 |
|
|
liumengyi
|
dbaceb0a29
|
* Add space, Kanban and region deletion methods.
|
2021-12-15 14:40:13 +08:00 |
|
|
孙广明
|
4c7f8d44e5
|
Merge branch 'sprint/177_zhengrunyu_close' into 'kanban'
*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug
See merge request easycorp/zentaopms!955
|
2021-12-15 06:15:18 +00:00 |
|
|
zhengrunyu
|
1ce962d177
|
*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug
|
2021-12-15 14:13:15 +08:00 |
|
|
孙广明
|
b50293adc0
|
Merge branch 'sprint/177_tianshujie_close' into 'kanban'
* Add close space function.
See merge request easycorp/zentaopms!954
|
2021-12-15 05:45:39 +00:00 |
|
|
tianshujie
|
e7e22df6bf
|
* Modify the code.
|
2021-12-15 13:43:36 +08:00 |
|
|
tianshujie
|
d6b68211a4
|
* Add and delete card function.
|
2021-12-15 13:33:41 +08:00 |
|
|
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 |
|