孙广明
|
2993776ce2
|
Merge branch 'master' into 'Fixbug'
# Conflicts:
# module/kanban/js/view.js
|
2022-01-27 03:02:56 +00:00 |
|
zhengrunyu
|
5b1a0f4b87
|
*change finished card and add status default
|
2022-01-27 10:35:33 +08:00 |
|
liumengyi
|
a7cae5e57f
|
* Fix bug #19060.
|
2022-01-27 10:32:29 +08:00 |
|
liumengyi
|
655b067c0b
|
* Fix bug #19060.
|
2022-01-27 10:02:21 +08:00 |
|
孙广明
|
e797653a34
|
* Finish task #47983.
|
2022-01-25 16:35:42 +08:00 |
|
liumengyi
|
113a50f462
|
* Modify sql file.
|
2022-01-24 16:56:08 +08:00 |
|
liumengyi
|
ecc9e22867
|
* Finish task 18883,add project team.
|
2022-01-24 16:54:30 +08:00 |
|
孙广明
|
72de0a1b9c
|
Merge branch 'master' into 'sprint/183_xieqiyu_47995new'
# Conflicts:
# db/update16.2.sql
# module/group/lang/resource.php
# module/kanban/js/view.js
# module/kanban/model.php
|
2022-01-24 07:28:48 +00:00 |
|
孙广明
|
e60e590ba8
|
Merge branch 'Fixbug' into 'master'
Fix bug 18885.
See merge request easycorp/zentaopms!1564
|
2022-01-24 06:27:05 +00:00 |
|
zhengrunyu
|
cc299e0b45
|
Fix bug 18885.
|
2022-01-24 14:24:19 +08:00 |
|
孙广明
|
881367f7bd
|
Merge branch 'sprint/183_hufangzhou_columnCreateMenu' into 'master'
* Code for task #47991.
See merge request easycorp/zentaopms!1561
|
2022-01-24 06:13:16 +00:00 |
|
hufangzhou
|
0530d95aac
|
* Rename the importObject to object.
|
2022-01-24 14:11:52 +08:00 |
|
liumengyi
|
7633710cfa
|
* Fix bug#18841, #18865, #18876, #18877, #18879 and #18891.
|
2022-01-24 13:31:12 +08:00 |
|
xieqiyu
|
780d82971f
|
* Add sql.
|
2022-01-24 13:24:17 +08:00 |
|
孙广明
|
3b100b47d2
|
Merge branch 'master' into 'sprint/183_zhengrunyu_48003'
# Conflicts:
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
# module/kanban/model.php
|
2022-01-24 01:26:45 +00:00 |
|
zhengrunyu
|
f06c5c5e30
|
*Finish task 47997 48003.
|
2022-01-24 08:36:25 +08:00 |
|
zhengrunyu
|
446f6e59d3
|
*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.
|
2022-01-21 14:31:00 +08:00 |
|
孙广明
|
cfb595e987
|
Merge branch 'sprint/183_mayue_47998' into 'master'
* Finish task #47998.
See merge request easycorp/zentaopms!1529
|
2022-01-21 06:00:56 +00:00 |
|
mayue
|
aaaefa509c
|
* Optimize code.
|
2022-01-21 13:32:58 +08:00 |
|
mayue
|
7b0694844c
|
* Finish task #47998.
|
2022-01-21 08:32:21 +08:00 |
|
王怡栋
|
a8457f1665
|
Merge branch 'master' into 'sprint/183_hufangzhou_47986'
# Conflicts:
# db/update16.2.sql
# module/group/lang/resource.php
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
|
2022-01-20 08:04:32 +00:00 |
|
hufangzhou
|
9aee0590c5
|
* Finish task #47986.
|
2022-01-20 15:52:18 +08:00 |
|
孙广明
|
aaa112c33b
|
Merge branch 'master' into 'sprint/183_mayue_47996'
# Conflicts:
# db/update16.2.sql
|
2022-01-19 09:29:23 +00:00 |
|
liyuchun
|
7e96eb9f68
|
Merge branch 'devops19'
|
2022-01-19 16:55:57 +08:00 |
|
mayue
|
39b7da7355
|
* Finish task #47996.
|
2022-01-19 16:50:40 +08:00 |
|
liumengyi
|
cca28df709
|
* Fix bug and add sql file.
|
2022-01-19 13:13:08 +08:00 |
|