Commit Graph

580 Commits

Author SHA1 Message Date
liyuchun
5ef3cb51a8 * Fix bug #17952. 2022-01-05 13:45:14 +08:00
liyuchun
818a1d7332 * Fix bug #17956. 2022-01-05 11:20:43 +08:00
zhujinyong
ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
王怡栋
a4ed3b0319 Merge branch 'sprint/liyuchun_devops18' into 'master'
* Add unit cases.

See merge request easycorp/zentaopms!1251
2022-01-04 07:18:49 +00:00
liyuchun
a6f469e461 * Add unit cases. 2022-01-04 15:10:28 +08:00
Hao Sun
a9cc771d85 Revert "Revert "Merge branch 'devops18_caoyanyi' into 'master'""
This reverts commit 3a0ec82016.
2021-12-31 17:35:39 +08:00
Hao Sun
3a0ec82016 Revert "Merge branch 'devops18_caoyanyi' into 'master'"
This reverts commit 41004048b2, reversing
changes made to 86fb6e2680.
2021-12-31 17:22:32 +08:00
李玉春
41004048b2 Merge branch 'devops18_caoyanyi' into 'master'
* Modify test case for apiCreateBranchPriv.

See merge request easycorp/zentaopms!1236
2021-12-31 07:54:26 +00:00
caoyanyi
401d793532 * Modify test case for apiCreateBranchPriv. 2021-12-31 07:33:58 +00:00
zenggang
031c8e03a9 * Add unit test 2021-12-31 05:56:16 +00:00
liyuchun
6f03910ea1 * Fix bug #18088. 2021-12-31 10:56:33 +08:00
王怡栋
f1d22a9e0e Merge branch 'devops18_liyuchun' into 'devops18'
* Fix bug #18088.

See merge request easycorp/zentaopms!1224
2021-12-31 02:27:01 +00:00
liyuchun
adc4c9ad98 * Fix bug #18088. 2021-12-31 10:23:49 +08:00
王怡栋
d4ddd1fd72 Merge branch 'devops18_liyuchun' into 'devops18'
* Fix bug #18087.

See merge request easycorp/zentaopms!1220
2021-12-31 01:46:52 +00:00
liyuchun
9d5829d99c * Fix bug #18087. 2021-12-31 09:45:58 +08:00
liyuchun
6107956524 * Fix bug #18087. 2021-12-31 09:42:24 +08:00
王怡栋
03dfe14a43 Merge branch 'devops18_liyuchun' into 'devops18'
* Fix bug #18087,18092.

See merge request easycorp/zentaopms!1216
2021-12-31 00:16:11 +00:00
liyuchun
c26309ad13 * Fix bug #18087,18092. 2021-12-30 17:49:04 +08:00
李玉春
1c88e99c78 Merge branch 'devops18_18046' into 'devops18'
* Fix bug#18046 and adjust code

See merge request easycorp/zentaopms!1199
2021-12-30 07:31:37 +00:00
liyuchun
c35185b5bf * Adjust base64. 2021-12-30 15:23:29 +08:00
liyuchun
930538179b * Fix eroor with special symbols. 2021-12-30 15:18:27 +08:00
zenggang
fce6751316 * Fix bug#18046 and adjust code 2021-12-30 07:06:37 +00:00
liyuchun
adac3aefdf * Finish task #46544. 2021-12-30 14:19:28 +08:00
liyuchun
1f4ee55810 * Finish task #46544,46556. 2021-12-30 14:05:57 +08:00
zenggang
3bfc8e04c1 * Adjust code 2021-12-30 05:24:37 +00:00
zenggang
bfde525f13 * Finish task#46555 2021-12-30 03:08:42 +00:00
李玉春
4270c776f1 Merge branch 'devops18_wangyidong_46552' into 'devops18'
Devops18 wangyidong 46552

See merge request easycorp/zentaopms!1173
2021-12-29 01:51:53 +00:00
王怡栋
2e7530441b * adjust for task #46552. 2021-12-29 09:49:43 +08:00
zenggang
7713ab8f29 * Finish task#46554 2021-12-28 07:00:36 +00:00
hufangzhou
4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
liyuchun
b94a067297 * Fix bug #17912. 2021-12-24 10:39:18 +08:00
liyuchun
51d75e0802 * Fix bug #17841,17830. 2021-12-23 09:20:40 +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
liyuchun
b9a2d19393 * Finish task #46140. 2021-12-21 16:55:55 +08:00
caoyanyi
dd807b4192 * Modify placeholder. 2021-12-21 06:11:10 +00:00
caoyanyi
76453ea1ba * Modify page style and back url. 2021-12-21 03:16:45 +00:00
zenggang
64646f028d * Adjust code 2021-12-20 09:48:58 +00: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
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
caoyanyi
d9a5f136b1 * Add gitlab tag create function and page. 2021-12-16 05:13:43 +00:00
liyuchun
acc03bdcfe * Fix bug #17439. 2021-12-13 14:40:43 +08:00
liyuchun
56d849cf0a * Fix bug #17439. 2021-12-13 14:28:19 +08:00
liyuchun
4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
李玉春
de158ea32d Merge branch 'sprint/devops16_17301' into 'sprint/devops16'
* Fix bug#17301

See merge request easycorp/zentaopms!894
2021-12-13 03:27:31 +00:00
caoyanyi
447e1a3e07 * Fix bug #17426. 2021-12-13 02:17:56 +00:00
王怡栋
2d60441372 Merge branch 'sprint/devops16' into 'devops16_caoyanyi_45677'
# Conflicts:
#   module/gitlab/view/browseproject.html.php
2021-12-10 07:40:46 +00:00
caoyanyi
35e55cc75e * Modify data type. 2021-12-10 07:33:24 +00:00