 孙广明
|
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 |
|
|
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 |
|
|
孙广明
|
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 |
|
|
李玉春
|
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 |
|
|
孙广明
|
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 |
|
|
孙广明
|
197a1bceea
|
* Finish task #46165.
|
2021-12-22 09:41:39 +08:00 |
|
|
zhouxin
|
5285fc3ac4
|
Fix bug #17797.
|
2021-12-22 01:41:09 +00:00 |
|
|
孙广明
|
1b05d78e65
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for enable archive.
See merge request easycorp/zentaopms!1053
|
2021-12-22 01:13:21 +00:00 |
|
|
liumengyi
|
47c35653d6
|
* Fix bug for enable archive.
|
2021-12-22 09:11:15 +08:00 |
|
|
zhujinyong
|
d8979e3e78
|
Merge branch 'sprint/178_hufangzhou_46388'
|
2021-12-22 08:55:40 +08:00 |
|
|
朱金勇
|
c250c080a4
|
Merge branch 'sprint/178_songchenxuan_46095_add' into 'master'
*Restrict the editing of the parent plan branch.
See merge request easycorp/zentaopms!1039
|
2021-12-22 00:51:30 +00:00 |
|
|
hufangzhou
|
10c2f33c2b
|
* Adjust the issue of merge branch.
|
2021-12-22 08:50:42 +08:00 |
|
|
朱金勇
|
3a3c461b51
|
Merge branch 'sprint/178_songchenxuan_fix_action/lang/en.php' into 'master'
Sprint/178 songchenxuan fix action/lang/en.php
See merge request easycorp/zentaopms!1050
|
2021-12-22 00:50:36 +00:00 |
|
|
songchenxuan
|
ebebbe127c
|
*Fix action/lang/en.php.
|
2021-12-22 08:49:06 +08:00 |
|
|
songchenxuan
|
45ea557272
|
*Fix action/lang/en.php.
|
2021-12-22 08:48:15 +08:00 |
|
|
孙广明
|
434e7fb369
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug for my meeting.
See merge request easycorp/zentaopms!1038
|
2021-12-22 00:16:44 +00:00 |
|
|
hufangzhou
|
9743ebbb92
|
* Finish task #46388.
|
2021-12-21 22:26:07 +08:00 |
|
|
李玉春
|
c474449b54
|
Merge branch 'sgm_fixbug' into 'master'
* Fix project priv bug.
See merge request easycorp/zentaopms!1012
|
2021-12-21 09:47:11 +00:00 |
|
|
mayue
|
ea0477b6b2
|
* Add a file.
|
2021-12-21 17:47:09 +08:00 |
|
|
mayue
|
807961ec25
|
* Modify a question.
|
2021-12-21 17:43:47 +08:00 |
|
|
孙广明
|
802f3a2282
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for move card.
See merge request easycorp/zentaopms!1046
|
2021-12-21 09:31:31 +00:00 |
|
|
liumengyi
|
17cd92f7d3
|
* Fix bug for move card.
|
2021-12-21 17:30:37 +08:00 |
|
|
孙广明
|
3481d14020
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17724, #17769, #17768, #17765, #17763, #17737.
See merge request easycorp/zentaopms!1045
|
2021-12-21 09:23:53 +00:00 |
|
|
liumengyi
|
93349c241a
|
* Fix bug.
|
2021-12-21 17:23:21 +08:00 |
|
|
liumengyi
|
6b7cbc74ab
|
* Fix bug #17724, #17769, #17768, #17765, #17763, #17737.
|
2021-12-21 17:16:46 +08:00 |
|
|
孙广明
|
2eb7b428a5
|
Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*Finish task 46246.
See merge request easycorp/zentaopms!1044
|
2021-12-21 09:14:05 +00:00 |
|
|
zhengrunyu
|
70e0458aa2
|
*Finish task 46246.
|
2021-12-21 17:12: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 |
|
|
孙广明
|
b8a4936df8
|
Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*Finish task 46246.
See merge request easycorp/zentaopms!1041
|
2021-12-21 09:04:49 +00:00 |
|
|
zhengrunyu
|
28533a6427
|
*Finish task 46246.
|
2021-12-21 17:04:11 +08:00 |
|
|
mayue
|
111521f560
|
* Optimize code.
|
2021-12-21 17:02:46 +08:00 |
|
|
tianshujie
|
03a86096c7
|
* Add space.
|
2021-12-21 17:01:47 +08:00 |
|