 李玉春
|
30acf3d2a7
|
Merge branch 'devops17' into 'devops17_wangyidong_46002'
# Conflicts:
# db/update16.0.beta1.sql
|
2021-12-21 03:19:16 +00:00 |
|
|
王怡栋
|
4a09257ab4
|
Merge branch 'devops17_caoyanyi_46003' into 'devops17'
Devops17 caoyanyi 46003
See merge request easycorp/zentaopms!1017
|
2021-12-21 00:46:08 +00:00 |
|
|
李玉春
|
6fff197f99
|
Merge branch 'devops17_zenggang' into 'devops17'
* Adjust code
See merge request easycorp/zentaopms!1015
|
2021-12-21 00:22:11 +00:00 |
|
|
zenggang
|
64646f028d
|
* Adjust code
|
2021-12-20 09:48:58 +00:00 |
|
|
王怡栋
|
29852dd3ea
|
* adjust for getRepoByUrl.
|
2021-12-20 16:46:16 +08:00 |
|
|
liyuchun
|
6296ed2139
|
Merge branch 'devops17_46138' into devops17
|
2021-12-20 15:36:19 +08:00 |
|
|
李玉春
|
c623ca78ac
|
Merge branch 'devops17' into 'devops17_46138'
# Conflicts:
# module/gitlab/lang/en.php
# module/gitlab/lang/zh-cn.php
# module/group/lang/resource.php
|
2021-12-20 07:34:35 +00:00 |
|
|
zenggang
|
586fbf06fc
|
* Adjust code
|
2021-12-20 07:30:21 +00:00 |
|
|
王怡栋
|
e66ab3ccbd
|
* adjust for API.
|
2021-12-20 15:04:53 +08:00 |
|
|
王怡栋
|
dcbe1dd7e4
|
Merge branch 'devops17_caoyanyi_tag' into 'devops17'
Devops17 caoyanyi tag
See merge request easycorp/zentaopms!1005
|
2021-12-20 06:35:45 +00:00 |
|
|
王怡栋
|
e18576efe7
|
* adjust for resource.
|
2021-12-20 14:24:47 +08:00 |
|
|
李玉春
|
6338f44643
|
Merge branch 'devops17_sunhao_icons' into 'devops17'
* Add and update icons for devops.
See merge request easycorp/zentaopms!997
|
2021-12-20 00:49:07 +00:00 |
|
|
Hao Sun
|
e63b34ca3b
|
* Add new icons: "ztool", "contacts", "chats", "tag", "tag-lock", "branch-lock", update: "menu-my", "program", "product", "project"
|
2021-12-17 16:56:08 +08:00 |
|
|
caoyanyi
|
9e08030544
|
* Modify conflict status.
|
2021-12-17 07:52:19 +00:00 |
|
|
caoyanyi
|
7791113e26
|
* Add create mr by api function.
|
2021-12-17 06:26:14 +00:00 |
|
|
zenggang
|
3dc85ea330
|
* Delete tag file
|
2021-12-17 06:06:10 +00:00 |
|
|
zenggang
|
54b9265be1
|
* Finish task#46138
|
2021-12-17 05:58:48 +00:00 |
|
|
王怡栋
|
b213ed54ba
|
Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Fix bug #17640.
See merge request easycorp/zentaopms!980
|
2021-12-17 05:04:26 +00:00 |
|
|
王怡栋
|
b96a5b286d
|
* adjust for task #46002.
|
2021-12-17 13:03:56 +08:00 |
|
|
liyuchun
|
0f49c232f3
|
* Fix bug #17640.
|
2021-12-17 11:12:05 +08:00 |
|
|
王怡栋
|
1a66159617
|
* code for task #46002.
|
2021-12-17 08:47:23 +08:00 |
|
|
李玉春
|
e7305d63d4
|
Merge branch 'devops17_46142' into 'devops17'
* Finish task#46142
See merge request easycorp/zentaopms!970
|
2021-12-16 06:47:10 +00:00 |
|
|
caoyanyi
|
d9a5f136b1
|
* Add gitlab tag create function and page.
|
2021-12-16 05:13:43 +00:00 |
|
|
caoyanyi
|
372fa0fa9c
|
* Add test case for gitlab tag create.
|
2021-12-16 05:13:18 +00:00 |
|
|
zenggang
|
af434d440a
|
* Finish task#46142
|
2021-12-16 03:12:21 +00:00 |
|
|
李玉春
|
898f65f84b
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!956
|
2021-12-15 07:45:07 +00:00 |
|
|
孙广明
|
874b4c6cdd
|
Merge branch 'sprint/master_tanghucheng_17565' into 'master'
* Fix bug #17565.
See merge request easycorp/zentaopms!959
|
2021-12-15 06:56:07 +00:00 |
|
|
tanghucheng
|
8409760490
|
* Fix bug #17565.
|
2021-12-15 14:55:04 +08:00 |
|
|
孙广明
|
04eb385659
|
* Fix bug.
|
2021-12-15 14:34:52 +08:00 |
|
|
朱金勇
|
eba28ffa85
|
Merge branch 'sprint/176_songchenxuan_45535' into 'master'
*Fix task #45535 bug.
See merge request easycorp/zentaopms!944
|
2021-12-15 00:40:22 +00:00 |
|
|
朱金勇
|
b3b60dd4e4
|
Merge branch 'sprint/176_songchenxuan_45545' into 'master'
*Fix task #45545 bug.
See merge request easycorp/zentaopms!941
|
2021-12-15 00:39:56 +00:00 |
|
|
songchenxuan
|
8a014b58f4
|
*Fix task #45535 bug.
|
2021-12-15 08:37:31 +08:00 |
|
|
songchenxuan
|
731c7fb45c
|
*Fix task #45545 bug.
|
2021-12-14 17:33:01 +08:00 |
|
|
朱金勇
|
328379d956
|
Merge branch 'sprint/176_xieqiyu_17516' into 'master'
* Fix bug#17516.
See merge request easycorp/zentaopms!939
|
2021-12-14 09:12:47 +00:00 |
|
|
孙广明
|
2be30ab738
|
Merge branch 'sprint/liyuchun_bug' into 'master'
* Fix bug #17521.
See merge request easycorp/zentaopms!938
|
2021-12-14 09:10:53 +00:00 |
|
|
xieqiyu
|
fde47bebb6
|
* Fix bug#17516.
|
2021-12-14 16:56:59 +08:00 |
|
|
liyuchun
|
df21c2f8bf
|
* Fix bug #17521.
|
2021-12-14 16:56:40 +08:00 |
|
|
朱金勇
|
7a7dd0d6c3
|
Merge branch 'sprint/176_xieqiyu_17503' into 'master'
* Fix bug#17503.
See merge request easycorp/zentaopms!931
|
2021-12-14 07:49:20 +00:00 |
|
|
xieqiyu
|
a978d41365
|
* Code for bug#17503.
|
2021-12-14 15:47:19 +08:00 |
|
|
朱金勇
|
d5d4cfe049
|
Merge branch 'sprint/176_mayue_45544' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!936
|
2021-12-14 07:43:32 +00:00 |
|
|
朱金勇
|
e683c32d25
|
Merge branch 'sprint/177_sunhao/use_rings' into 'master'
* Refactor progress-pie instead of rings to improve perf.
See merge request easycorp/zentaopms!932
|
2021-12-14 07:40:58 +00:00 |
|
|
Hao Sun
|
2f862118d8
|
* Refactor progress-pie instead of rings to improve perf.
|
2021-12-14 14:31:41 +08:00 |
|
|
xieqiyu
|
ed9eedf543
|
* Fix bug#17503.
|
2021-12-14 14:27:26 +08:00 |
|
|
李玉春
|
7f098934f8
|
Merge branch 'devops_mr_unit' into 'master'
* Add mr create unit test and adjust code
See merge request easycorp/zentaopms!919
|
2021-12-14 06:10:24 +00:00 |
|
|
zenggang
|
9c47c36ba3
|
* Adjust code style
|
2021-12-14 06:06:55 +00:00 |
|
|
mayue
|
7deea0d588
|
* Optimize code.
|
2021-12-14 13:42:54 +08:00 |
|
|
朱金勇
|
efdadc07a7
|
Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.
See merge request easycorp/zentaopms!928
|
2021-12-14 05:34:42 +00:00 |
|
|
mayue
|
35a7df0974
|
* Optimize code.
|
2021-12-14 11:02:15 +08:00 |
|
|
mayue
|
ccf82f6226
|
* Modify annotation.
|
2021-12-14 10:18:35 +08:00 |
|
|
朱金勇
|
a14138be45
|
Merge branch 'sprint/176_xieqiyu_17472' into 'master'
* Fix bug#17472.
See merge request easycorp/zentaopms!921
|
2021-12-14 01:54:13 +00:00 |
|