 tianshujie
|
dab44100d5
|
* Finish task #46241.
|
2021-12-22 13:16:32 +08:00 |
|
|
liumengyi
|
b8166358ad
|
* Finish task #46244, #46243.
|
2021-12-21 13:46:31 +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
|
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 |
|
|
tianshujie
|
442fbdad44
|
* Finish task #46157.
|
2021-12-20 14:42:06 +08:00 |
|
|
liumengyi
|
14c584555e
|
* Add function comments.
|
2021-12-20 14:35:36 +08:00 |
|
|
liumengyi
|
6fadc5c013
|
* Finish task #46155.
|
2021-12-20 14:29:55 +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 |
|
|
孙广明
|
ab43352a90
|
Merge branch 'sprint/179_zhengrunyu_46159' into 'kanban'
Sprint/179 zhengrunyu 46159
See merge request easycorp/zentaopms!987
|
2021-12-20 01:35:14 +00:00 |
|
|
zhengrunyu
|
08b8e71727
|
*Finish
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
cc7c03b834
|
* Fix code details.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
7fb096c451
|
* Finish task #46164.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
1c61b2a759
|
Merge branch 'kanban' into 'sprint/179_liumengyi_46158'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-20 00:53:10 +00:00 |
|
|
liumengyi
|
fc7b18ca37
|
* Remove unwanted space.
|
2021-12-20 08:47:25 +08:00 |
|
|
zhengrunyu
|
22156e1836
|
*Finish task.
|
2021-12-20 08:19:01 +08:00 |
|
|
zhengrunyu
|
7d78b9c4fb
|
*Fix bug
|
2021-12-17 17:33:24 +08:00 |
|
|
孙广明
|
87c12c800a
|
* Fix code details.
|
2021-12-17 15:43:19 +08:00 |
|
|
liumengyi
|
7d3ad08bc6
|
* Finish task #46158, and fix bug #17657,#17655.
|
2021-12-17 15:39:41 +08:00 |
|
|
孙广明
|
9f7eecf9c6
|
* Finish task #46164.
|
2021-12-17 15:25:59 +08:00 |
|
|
tianshujie
|
2628b1c33f
|
* Finish task #46151.
|
2021-12-17 15:11:26 +08:00 |
|
|
tianshujie
|
cd4b1019ef
|
Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151
|
2021-12-17 09:30:32 +08:00 |
|
|
tianshujie
|
9ad591fc93
|
* Realize the function of sub-molecules.
|
2021-12-17 09:27:50 +08:00 |
|
|
liumengyi
|
cc59614c39
|
* Finish task #46240.
|
2021-12-17 08:49:43 +08:00 |
|
|
tianshujie
|
d5f1c13624
|
Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151
|
2021-12-16 14:50:49 +08:00 |
|
|
tianshujie
|
ea92c854d6
|
* Modify the error.
|
2021-12-16 14:41:36 +08:00 |
|
|
tianshujie
|
f58bbf9ad1
|
Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151
|
2021-12-16 14:37:41 +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
|
99095f8785
|
* Add a sub-column page.
|
2021-12-16 14:18:57 +08:00 |
|
|
tianshujie
|
af350d6db2
|
* Finish task #46148.
|
2021-12-16 10:07:41 +08:00 |
|
|
孙广明
|
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 |
|
|
zhengrunyu
|
244a4b4bdd
|
*fix bug.
|
2021-12-16 08:37:24 +08:00 |
|
|
liumengyi
|
4716224337
|
* Finish task #46150.
|
2021-12-15 17:46:30 +08:00 |
|
|
liumengyi
|
925919f913
|
* Modify the deletion prompt of lane, column and card.
|
2021-12-15 16:25:35 +08: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 |
|
|
zhengrunyu
|
d236164410
|
*add delete lane and column.
|
2021-12-15 14:51: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 |
|
|
tianshujie
|
d6b68211a4
|
* Add and delete card function.
|
2021-12-15 13:33:41 +08:00 |
|
|
tianshujie
|
66174b2341
|
* Add close space function.
|
2021-12-15 11:31:02 +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 |
|
|
zhengrunyu
|
57474fce26
|
*Fix bug
|
2021-12-15 10:23:33 +08:00 |
|
|
liumengyi
|
1de91f9c04
|
* Fix bug #17537,#17542.
|
2021-12-15 10:20:14 +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 |
|
|
孙广明
|
8d77f8599b
|
* Code for card.
|
2021-12-14 14:43:48 +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
|
ce48a83014
|
* Add setting button print permission.
|
2021-12-14 11:25:14 +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 |
|
|
tianshujie
|
5f33672c12
|
* Modify the save prompt method.
|
2021-12-14 10:44:31 +08:00 |
|