 孙广明
|
9f7eecf9c6
|
* Finish task #46164.
|
2021-12-17 15:25:59 +08:00 |
|
|
孙广明
|
2722e08c1c
|
Merge branch 'sprint/177_zhengruyu_' into 'kanban'
*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish...
See merge request easycorp/zentaopms!978
|
2021-12-17 01:17:13 +00:00 |
|
|
zhengrunyu
|
a40d4b9ce1
|
*Finish task.
|
2021-12-17 09:11:22 +08:00 |
|
|
孙广明
|
31fcde628b
|
Merge branch 'sprint/179_liumengyi_46240' into 'kanban'
* Finish task #46240.
See merge request easycorp/zentaopms!977
|
2021-12-17 00:57:09 +00:00 |
|
|
zhengrunyu
|
a377632a45
|
*Finish task.
|
2021-12-17 08:54:46 +08:00 |
|
|
zhengrunyu
|
3a7789e413
|
*Finish task
|
2021-12-17 08:54:46 +08:00 |
|
|
zhengrunyu
|
80ca6c5585
|
*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.
|
2021-12-17 08:54:46 +08:00 |
|
|
liumengyi
|
cc59614c39
|
* Finish task #46240.
|
2021-12-17 08:49:43 +08:00 |
|
|
李玉春
|
ddf625db0b
|
Merge branch 'sprint/30_zhouxin_bug_17513' into 'kanban'
Fix bug #17513.
See merge request easycorp/zentaopms!962
|
2021-12-17 00:08:59 +00:00 |
|
|
zhouxin
|
0683b91b5c
|
Fixed wrong method used.
|
2021-12-16 08:30:49 +00:00 |
|
|
李玉春
|
413865019a
|
Merge branch 'sprint/179_tianshujie_error' into 'kanban'
* Modify the error.
See merge request easycorp/zentaopms!972
|
2021-12-16 06:43:34 +00:00 |
|
|
tianshujie
|
ea92c854d6
|
* Modify the error.
|
2021-12-16 14:41:36 +08:00 |
|
|
孙广明
|
802e7c8f1a
|
Merge branch 'sprint/177_tianshujie_46148' into kanban
|
2021-12-16 14:36:15 +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 |
|
|
孙广明
|
0ae5f57d7f
|
Merge branch 'sprint/179_liumengyi_addpriv' into kanban
|
2021-12-16 14:14:34 +08:00 |
|
|
孙广明
|
50f207d053
|
Merge branch 'kanban' into 'sprint/179_liumengyi_addpriv'
# Conflicts:
# module/group/lang/resource.php
|
2021-12-16 06:14:24 +00:00 |
|
|
孙广明
|
0ce78c1930
|
Merge branch 'sprint/30_zhouxin_bug_17524' into 'kanban'
Fix bug 17524.
See merge request easycorp/zentaopms!971
|
2021-12-16 05:19:22 +00:00 |
|
|
zhouxin
|
27ee4d87ed
|
Fix bug 17524.
|
2021-12-16 05:15:08 +00:00 |
|
|
liumengyi
|
21d7584660
|
* Add card permissions.
|
2021-12-16 10:37:07 +08:00 |
|
|
tianshujie
|
af350d6db2
|
* Finish task #46148.
|
2021-12-16 10:07:41 +08:00 |
|
|
孙广明
|
6bf47bf918
|
Merge branch 'sprint/179_liumengyi_addpriv' into 'kanban'
* Add permission for card.
See merge request easycorp/zentaopms!966
|
2021-12-16 01:37:50 +00:00 |
|
|
liumengyi
|
990f1fb88c
|
* Add permission for card.
|
2021-12-16 09:35:50 +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 |
|
|
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 |
|
|
zhouxin
|
f1079a528a
|
Fix bug #17513.
|
2021-12-15 09:08:23 +00: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 |
|