 孙广明
|
453145af31
|
Merge branch 'master' into 'sprint/179_zhengrunyu_fixbug'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-22 07:51:02 +00:00 |
|
|
孙广明
|
ea15a6c2ed
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17822.
See merge request easycorp/zentaopms!1068
|
2021-12-22 07:49:57 +00:00 |
|
|
zenggang
|
ca1f1e645b
|
* Add mr update unit
|
2021-12-22 07:49:49 +00:00 |
|
|
孙广明
|
ded871aa6f
|
Merge branch 'sprint/31_zhouxin_17711' into 'master'
Sprint/31 zhouxin 17711
See merge request easycorp/zentaopms!1066
|
2021-12-22 07:49:40 +00:00 |
|
|
孙广明
|
83c8385b69
|
Merge branch 'sprint/31_zhouxin_17665' into 'master'
Fix bug #17665.
See merge request easycorp/zentaopms!1074
|
2021-12-22 07:48:35 +00:00 |
|
|
zhouxin
|
18383e225b
|
Fix bug #17665.
|
2021-12-22 07:44:26 +00:00 |
|
|
Hao Sun
|
88544cf4b9
|
* fix kanban columns width.
|
2021-12-22 15:41:17 +08:00 |
|
|
孙广明
|
6b9751f78e
|
Merge branch 'sprint/178_mayue_46098' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!1071
|
2021-12-22 07:37:29 +00:00 |
|
|
zhengrunyu
|
7578906006
|
*change avater show.
|
2021-12-22 15:36:36 +08:00 |
|
|
mayue
|
5da1b391cc
|
* Optimize code.
|
2021-12-22 15:35:16 +08:00 |
|
|
李玉春
|
3de88dbf10
|
Merge branch 'devops17_wangyidong_api' into 'devops17'
* adjust for vs code and php8.0.
See merge request easycorp/zentaopms!1070
|
2021-12-22 07:28:15 +00:00 |
|
|
王怡栋
|
49bfd2dd18
|
* adjust for vs code and php8.0.
|
2021-12-22 15:24:47 +08:00 |
|
|
zenggang
|
5751dd0783
|
* Fix bug#17846
|
2021-12-22 07:17:31 +00:00 |
|
|
liumengyi
|
12b292b157
|
* Fix bug #17822.
|
2021-12-22 15:10:45 +08:00 |
|
|
孙广明
|
edcd625b35
|
Merge branch 'sprint/179_liumengyi_fixbug'
|
2021-12-22 14:32:22 +08:00 |
|
|
孙广明
|
5418b47edc
|
Merge branch 'master' into 'sprint/179_liumengyi_fixbug'
# Conflicts:
# module/kanban/css/space.css
|
2021-12-22 06:31:37 +00:00 |
|
|
songchenxuan
|
a7258e471b
|
*Finish task #46100.
|
2021-12-22 14:28:28 +08:00 |
|
|
liumengyi
|
e454aa2757
|
* Fix bug #17768.
|
2021-12-22 14:26:22 +08:00 |
|
|
zhouxin
|
d0eb0e8662
|
Fix bug #17711.
|
2021-12-22 06:09:36 +00:00 |
|
|
孙广明
|
bb9171d6ba
|
Merge branch 'sprint/179_tianshujie_46241'
|
2021-12-22 14:05:03 +08:00 |
|
|
孙广明
|
75a3d20358
|
Merge branch 'master' into 'sprint/179_tianshujie_46241'
# Conflicts:
# module/group/lang/resource.php
# module/kanban/css/space.css
# module/kanban/js/view.js
|
2021-12-22 06:03:21 +00:00 |
|
|
zhouxin
|
32bb53370c
|
Fix bug #17711.
|
2021-12-22 06:01:35 +00:00 |
|
|
tianshujie
|
0c5b069581
|
* Modify file comment.
|
2021-12-22 13:52:51 +08:00 |
|
|
tianshujie
|
84e368ccab
|
* Adjust Kanban permissions.
|
2021-12-22 13:48:47 +08:00 |
|
|
孙广明
|
b282a51d1c
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Finish task #46146.
See merge request easycorp/zentaopms!1064
|
2021-12-22 05:25:43 +00:00 |
|
|
liumengyi
|
62be3e024e
|
* Remove unwanted code.
|
2021-12-22 13:16:42 +08:00 |
|
|
tianshujie
|
dab44100d5
|
* Finish task #46241.
|
2021-12-22 13:16:32 +08:00 |
|
|
liumengyi
|
b355559d0e
|
* Finish task #46146.
|
2021-12-22 13:10:12 +08:00 |
|
|
李玉春
|
c77fbcadb3
|
Merge branch 'devops17_17751' into 'devops17'
Devops17 17751
See merge request easycorp/zentaopms!1057
|
2021-12-22 03:21:47 +00:00 |
|
|
孙广明
|
9d078d3067
|
Merge branch 'sprint/178_mayue_16292' into 'master'
* Fix a bug #16292.
See merge request easycorp/zentaopms!1060
|
2021-12-22 03:14:12 +00:00 |
|
|
李玉春
|
de67c1ad49
|
Merge branch 'sgm_46165' into 'master'
* Finish task #46165.
See merge request easycorp/zentaopms!1054
|
2021-12-22 03:12:09 +00:00 |
|
|
mayue
|
521cb5654a
|
* Optimize code.
|
2021-12-22 11:10:37 +08:00 |
|
|
孙广明
|
3417a97edc
|
Merge branch 'sprint/31_zhouxin_17797' into 'master'
Fix bug #17797.
See merge request easycorp/zentaopms!1062
|
2021-12-22 03:07:56 +00:00 |
|
|
孙广明
|
b22fa1b678
|
Merge branch 'sprint/178_mayue_46098' into 'master'
* Finish a task #46098.
See merge request easycorp/zentaopms!1049
|
2021-12-22 03:01:12 +00:00 |
|
|
李玉春
|
7d8dbf5db8
|
Merge branch 'devops17_46005' into 'devops17'
* Finish task#46005
See merge request easycorp/zentaopms!1051
|
2021-12-22 03:00:47 +00:00 |
|
|
zenggang
|
cb1c14b98b
|
* Adjust code style
|
2021-12-22 02:59:57 +00:00 |
|
|
李玉春
|
84f2cfb102
|
Merge branch 'sgm_fixbug' into 'master'
* Finish task #46161.
See merge request easycorp/zentaopms!1059
|
2021-12-22 02:53:35 +00:00 |
|
|
孙广明
|
b50ed9131b
|
Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*card name warp.
See merge request easycorp/zentaopms!1063
|
2021-12-22 02:53:20 +00:00 |
|
|
songchenxuan
|
1c8df7822a
|
*Finish task #46100.
|
2021-12-22 10:48:55 +08:00 |
|
|
孙广明
|
19f32378b0
|
* Fix code details.
|
2021-12-22 10:48:33 +08:00 |
|
|
zhengrunyu
|
b5b1fb4d81
|
*card name warp.
|
2021-12-22 10:47:29 +08:00 |
|
|
孙广明
|
610112438c
|
* Fix details.
|
2021-12-22 10:46:23 +08:00 |
|
|
mayue
|
14a7faf16d
|
* Optimize code.
|
2021-12-22 10:36:55 +08:00 |
|
|
孙广明
|
08c7f0cc50
|
* Finish task #46161.
|
2021-12-22 10:31:43 +08:00 |
|
|
孙广明
|
75fa4d2dd2
|
Merge branch 'sprint/178_hufangzhou_mergebranchpriv' into 'master'
* Resolve the issue of merge branch.
See merge request easycorp/zentaopms!1058
|
2021-12-22 02:08:40 +00:00 |
|
|
hufangzhou
|
5b0923a7a3
|
* Resolve the issue of merge branch.
|
2021-12-22 10:07:18 +08:00 |
|
|
mayue
|
11a989307b
|
* Fix a bug #16292.
|
2021-12-22 10:07:01 +08:00 |
|
|
zenggang
|
b921ba7679
|
* Fix bug#17751
|
2021-12-22 02:05:14 +00:00 |
|
|
zenggang
|
f66c50d9db
|
* Fix bug#17751
|
2021-12-22 02:03:35 +00:00 |
|
|
王怡栋
|
71df92bee6
|
Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Adjust api create mr.
See merge request easycorp/zentaopms!1056
|
2021-12-22 01:53:51 +00:00 |
|