 tianshujie
|
dab44100d5
|
* Finish task #46241.
|
2021-12-22 13:16:32 +08:00 |
|
|
孙广明
|
6d7569542c
|
Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17780,#17770,#17760,#17759,#17743.
See merge request easycorp/zentaopms!1043
|
2021-12-21 09:05:28 +00:00 |
|
|
tianshujie
|
7b918d91f0
|
* Fix bug #17780,#17770,#17760,#17759,#17743.
|
2021-12-21 16:57:06 +08:00 |
|
|
liumengyi
|
e2cbf7dab7
|
* Fix bug #17765, #17763, #17737.
|
2021-12-21 15:21:18 +08:00 |
|
|
孙广明
|
0fa8bbfb70
|
Merge branch 'sprint/179_tianshujie_17754' into 'master'
* Fix bug #17756,#17755,#17754,#17752,#17747.
See merge request easycorp/zentaopms!1031
|
2021-12-21 06:03:33 +00:00 |
|
|
tianshujie
|
171045fab4
|
* Fix bug #17756,#17755,#17754,#17752,#17747.
|
2021-12-21 13:59:03 +08:00 |
|
|
孙广明
|
4de57a92d2
|
Merge branch 'sprint/179_liumengyi_46244' into 'master'
* Finish task #46244, #46243.
See merge request easycorp/zentaopms!1030
|
2021-12-21 05:56:06 +00:00 |
|
|
liumengyi
|
b8166358ad
|
* Finish task #46244, #46243.
|
2021-12-21 13:46:31 +08:00 |
|
|
孙广明
|
187c67fd3b
|
Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17694,17683.
See merge request easycorp/zentaopms!1027
|
2021-12-21 03:32:08 +00:00 |
|
|
tianshujie
|
7d49e79513
|
* Fix bug #17694,17683.
|
2021-12-21 11:26:26 +08:00 |
|
|
zhengrunyu
|
8599448fda
|
*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug
|
2021-12-21 10:08:11 +08:00 |
|
|
孙广明
|
e1a6381454
|
Merge branch 'sprint/179_liumengyi_46156' into 'master'
* Finish task #46156.
See merge request easycorp/zentaopms!1016
|
2021-12-21 00:44:25 +00:00 |
|
|
liumengyi
|
6c9f4248cd
|
* Add dafault card color.
|
2021-12-21 08:43:13 +08:00 |
|
|
liumengyi
|
8712f7640a
|
* Finish task #46156.
|
2021-12-21 08:37:40 +08:00 |
|
|
孙广明
|
54b712feed
|
Merge branch 'master' into 'sprint/179_tianshujie_46157'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-20 08:46:31 +00:00 |
|
|
李玉春
|
df28168e3e
|
Merge branch 'sgm_kanbanstyle' into 'master'
Sgm kanbanstyle
See merge request easycorp/zentaopms!1010
|
2021-12-20 08:44:44 +00:00 |
|
|
孙广明
|
5d7b75bb53
|
Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master'
*Fix bug 17653.
See merge request easycorp/zentaopms!1009
|
2021-12-20 08:34:27 +00:00 |
|
|
zhengrunyu
|
f578251936
|
*Fix bug 17653.
|
2021-12-20 16:28:50 +08:00 |
|
|
liumengyi
|
96971d9029
|
* Finish task #46155.
|
2021-12-20 15:40:02 +08:00 |
|
|
tianshujie
|
0cceea2b86
|
* Add translation judgment.
|
2021-12-20 14:59:05 +08:00 |
|
|
tianshujie
|
442fbdad44
|
* Finish task #46157.
|
2021-12-20 14:42:06 +08:00 |
|
|
liumengyi
|
6fadc5c013
|
* Finish task #46155.
|
2021-12-20 14:29:55 +08:00 |
|
|
孙广明
|
a24a6918e1
|
* Fix kanban style.
|
2021-12-20 14:27:07 +08:00 |
|
|
孙广明
|
177c9b158f
|
Merge branch 'sprint/179_tianshujie_46151' into 'kanban'
Sprint/179 tianshujie 46151
See merge request easycorp/zentaopms!991
|
2021-12-20 02:41:05 +00:00 |
|
|
tianshujie
|
ecd2d541ac
|
* Restore code.
|
2021-12-20 08:45:35 +08:00 |
|
|
tianshujie
|
54cf020b63
|
* Modify the code.
|
2021-12-17 15:54:13 +08:00 |
|
|
李玉春
|
f2fae37b7f
|
Merge branch 'sgm_movecard' into 'kanban'
*Finish task #46164
See merge request easycorp/zentaopms!992
|
2021-12-17 07:52:10 +00:00 |
|
|
孙广明
|
9f7eecf9c6
|
* Finish task #46164.
|
2021-12-17 15:25:59 +08:00 |
|
|
tianshujie
|
13fe70296a
|
* Ajust code of kanban.
|
2021-12-17 15:20:10 +08:00 |
|
|
tianshujie
|
2628b1c33f
|
* Finish task #46151.
|
2021-12-17 15:11:26 +08:00 |
|
|
zhengrunyu
|
80cd2e52fd
|
*Fix .
|
2021-12-17 13:23:09 +08:00 |
|
|
zhengrunyu
|
0e5b54464c
|
*Finish task.
|
2021-12-17 13:18:10 +08:00 |
|
|
tianshujie
|
9ad591fc93
|
* Realize the function of sub-molecules.
|
2021-12-17 09:27:50 +08:00 |
|
|
孙广明
|
2d2c70abe4
|
Merge branch 'kanban' into 'sprint/177_tianshujie_46148'
# Conflicts:
# module/kanban/control.php
# module/kanban/model.php
|
2021-12-16 06:28:32 +00:00 |
|
|
tianshujie
|
5444c8f471
|
* Query Kanban data.
|
2021-12-16 14:26:03 +08:00 |
|
|
tianshujie
|
348bede8f0
|
* Modify the code.
|
2021-12-16 14:21:21 +08:00 |
|
|
tianshujie
|
af350d6db2
|
* Finish task #46148.
|
2021-12-16 10:07:41 +08:00 |
|
|
liumengyi
|
4716224337
|
* Finish task #46150.
|
2021-12-15 17:46:30 +08: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 |
|
|
liumengyi
|
d0a4a17fd9
|
* Modify judgment conditions.
|
2021-12-15 14:48:31 +08:00 |
|
|
liumengyi
|
dbaceb0a29
|
* Add space, Kanban and region deletion methods.
|
2021-12-15 14:40:13 +08: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 |
|
|
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 |
|
|
孙广明
|
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 |
|
|
tianshujie
|
66174b2341
|
* Add close space function.
|
2021-12-15 11:31:02 +08:00 |
|
|
tianshujie
|
9cc52b4169
|
* Modify and create card style.
|
2021-12-15 11:13:17 +08: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 |
|
|
liumengyi
|
085846cb48
|
* Add judgment conditions.
|
2021-12-15 10:25:27 +08:00 |
|
|
liumengyi
|
1de91f9c04
|
* Fix bug #17537,#17542.
|
2021-12-15 10:20:14 +08:00 |
|
|
liumengyi
|
f1289a8d1a
|
* Modify set wip method.
|
2021-12-15 10:10:20 +08:00 |
|