 孙广明
|
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 |
|
|
孙广明
|
8d77f8599b
|
* Code for card.
|
2021-12-14 14:43:48 +08:00 |
|
|
tianshujie
|
44c8a3b7a8
|
* Fix bug #17506.
|
2021-12-14 14:39:44 +08:00 |
|
|
liumengyi
|
5d96d7d9c7
|
* Modify English language items.
|
2021-12-14 14:37:32 +08:00 |
|
|
zhengrunyu
|
d7b47e42b0
|
*Fix bug
|
2021-12-14 14:35:24 +08:00 |
|
|
liumengyi
|
bec43f53b9
|
* Fix bug #17510.
|
2021-12-14 14:26:19 +08:00 |
|
|
tianshujie
|
1ee34df707
|
* Add authority control to the kanban column operation buttons.
|
2021-12-14 14:09:34 +08:00 |
|
|
孙广明
|
f3a2bdce00
|
Merge branch 'sprint/177_liumengyi_fixbug' into 'kanban'
* Fix bug for view card.
See merge request easycorp/zentaopms!929
|
2021-12-14 06:07:00 +00:00 |
|
|
liumengyi
|
4244e0cc23
|
* Remove useless code.
|
2021-12-14 13:54:53 +08:00 |
|
|
liumengyi
|
7fded68a0d
|
* Fix bug for view card.
|
2021-12-14 13:53:14 +08:00 |
|
|
tianshujie
|
dbc8968eb1
|
* Modify the width of the pop-up window.
|
2021-12-14 13:48:04 +08:00 |
|
|
孙广明
|
7d35d1c878
|
Merge branch 'sprint/177_tianshujie_kanban' into 'kanban'
* Modify the save prompt method.
See merge request easycorp/zentaopms!926
|
2021-12-14 03:31:19 +00:00 |
|
|
tianshujie
|
1ba0da2414
|
* Edit button.
|
2021-12-14 11:29:16 +08:00 |
|
|
tianshujie
|
ce48a83014
|
* Add setting button print permission.
|
2021-12-14 11:25:14 +08:00 |
|
|
孙广明
|
ce52632d91
|
Merge branch 'sprint/177_liumengyi_fixbug' into 'kanban'
* Fix bug for create kanban card.
See merge request easycorp/zentaopms!927
|
2021-12-14 03:19:48 +00:00 |
|
|
liumengyi
|
778693727f
|
* Fix bug for create kanban card.
|
2021-12-14 11:18:17 +08:00 |
|
|
孙广明
|
cc1b1ed0df
|
Merge branch 'sprint/177_liumengyi_45820' into 'kanban'
* Finish task #45820.
See merge request easycorp/zentaopms!925
|
2021-12-14 03:11:37 +00:00 |
|
|
liumengyi
|
f743e11177
|
* Modify view card file.
|
2021-12-14 11:09:09 +08:00 |
|
|
孙广明
|
eab106b614
|
* Code for display card.
|
2021-12-14 11:01:49 +08:00 |
|
|
tianshujie
|
5f33672c12
|
* Modify the save prompt method.
|
2021-12-14 10:44:31 +08:00 |
|
|
liumengyi
|
8ad14bea25
|
* Finish task #45820.
|
2021-12-14 10:42:59 +08:00 |
|
|
孙广明
|
ee77fa21e3
|
Merge branch 'sprint/kanban_tanghucheng_17316' into 'kanban'
* Fix bug #17314,17316.
See merge request easycorp/zentaopms!923
|
2021-12-14 02:31:03 +00:00 |
|
|
tanghucheng
|
2c6bc8ac7e
|
* Fix bug #17316.
|
2021-12-14 10:29:01 +08:00 |
|
|
tanghucheng
|
781314142c
|
* Fix bug #17316.
|
2021-12-14 10:20:34 +08:00 |
|
|
孙广明
|
0dede9e395
|
Merge branch 'sprint/177_tianshujie_action' into 'kanban'
Sprint/177 tianshujie action
See merge request easycorp/zentaopms!922
|
2021-12-14 02:16:08 +00:00 |
|
|
tianshujie
|
4571f1bfa8
|
* Add Kanban permission control.
|
2021-12-14 10:01:38 +08:00 |
|
|
孙广明
|
900ee6ac24
|
Merge branch 'sprint/max_tanghucheng_45806' into 'kanban'
* Finish task #45806.
See merge request easycorp/zentaopms!900
|
2021-12-14 00:53:41 +00:00 |
|
|
tianshujie
|
d429a09d42
|
* Fix the error.
|
2021-12-13 17:46:30 +08:00 |
|
|
tianshujie
|
cc414d4e14
|
* Fix Kanban dynamic issue.
|
2021-12-13 17:45:42 +08:00 |
|
|
朱金勇
|
b01b11dd7b
|
Merge branch 'sprint/30_zhouxin_45800' into 'kanban'
Finish task #45800.
See merge request easycorp/zentaopms!917
|
2021-12-13 09:01:02 +00:00 |
|
|
zhouxin
|
4f5367dae7
|
made small changes.
|
2021-12-13 08:56:39 +00:00 |
|
|
zhouxin
|
40f27795e1
|
change if...else to switch...case,change now to today.
|
2021-12-13 08:45:37 +00:00 |
|
|
孙广明
|
10d77713d1
|
Merge branch 'sprint/master_zhouxin_45795' into 'kanban'
Sprint/master zhouxin 45795
See merge request easycorp/zentaopms!863
|
2021-12-13 08:45:10 +00:00 |
|
|
孙广明
|
875451d898
|
Merge branch 'sprint/177_tianshujie_card' into kanban
|
2021-12-13 16:11:16 +08:00 |
|
|
孙广明
|
d75774cafc
|
Merge branch 'kanban' into 'sprint/177_tianshujie_card'
# Conflicts:
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
|
2021-12-13 08:11:03 +00:00 |
|
|
tianshujie
|
8add043e90
|
* Modify the code.
|
2021-12-13 16:06:15 +08:00 |
|
|
zhouxin
|
9567620ff4
|
Finish task #45800.
|
2021-12-13 07:53:23 +00:00 |
|
|
tianshujie
|
6a894bc7fb
|
* Finish task #45829.
|
2021-12-13 15:37:33 +08:00 |
|
|
李玉春
|
e622e958cf
|
Merge branch 'sgm_addcard' into 'kanban'
* Code for task #45819.
See merge request easycorp/zentaopms!914
|
2021-12-13 07:11:47 +00:00 |
|
|
孙广明
|
91b700ec42
|
* Fix code details.
|
2021-12-13 14:59:43 +08:00 |
|