Commit Graph

156 Commits

Author SHA1 Message Date
王怡栋
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
李玉春
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
zenggang
7713ab8f29 * Finish task#46554 2021-12-28 07:00:36 +00: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
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
李玉春
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
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
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
李玉春
fec4ab4604 Merge branch 'sprint/devops16_wangyidong_test' into 'sprint/devops16'
Sprint/devops16 wangyidong test

See merge request easycorp/zentaopms!888
2021-12-10 07:06:16 +00:00
王怡栋
36be7f468c * code for task #17340. 2021-12-10 14:14:25 +08:00
王怡栋
bfcb3deb8e * code for task #45676. 2021-12-10 13:30:07 +08:00
liyuchun
41b90898ee * Fix bug #17298. 2021-12-10 09:59:43 +08:00
liyuchun
0ab14d8df2 * Fix bug #17343, Finish task #45443. 2021-12-10 09:42:21 +08:00
王怡栋
068eeee4e8 * code for task #45435. 2021-12-09 17:14:36 +08:00
caoyanyi
c6c8f8de15 * Modify icon. 2021-12-09 08:50:30 +00:00
王怡栋
91faac255a * code for task #45438,45437. 2021-12-09 16:10:17 +08:00
王怡栋
c09fcb0c15 Merge branch 'devops16_caoyanyi_45499' into sprint/devops16 2021-12-09 15:40:44 +08:00
caoyanyi
c2513ccc92 * Adjust codes. 2021-12-09 07:12:35 +00:00
caoyanyi
60e6727f35 * Add mouseover title. 2021-12-09 06:48:32 +00:00
caoyanyi
f7e55495be * Optimize page style. 2021-12-09 06:04:33 +00:00
caoyanyi
a8abcb6c9f * Add create and edit auth. 2021-12-09 02:14:37 +00:00
caoyanyi
8249473e63 * Finish task #45499. 2021-12-09 01:25:55 +00:00
caoyanyi
32b81b45fa * Modify icon. 2021-12-08 08:51:44 +00:00
zenggang
6117354514 * Finish task#45444 2021-12-08 07:52:52 +00:00
李玉春
ed5a494bf8 Merge branch 'sprint/devops16_4550' into 'sprint/devops16'
* Code for task#45500

See merge request easycorp/zentaopms!820
2021-12-08 05:11:57 +00:00
liyuchun
c1db0bcb01 * Finish task #45442. 2021-12-08 13:04:29 +08:00
zenggang
131a9ef165 * Code for task#45500 2021-12-08 02:39:08 +00:00
liyuchun
d40736d387 * Finish task #45491. 2021-12-08 08:56:39 +08:00
李玉春
7ad1c3e550 Merge branch 'sprint/devops16_task45434' into 'sprint/devops16'
* Finish task#45434

See merge request easycorp/zentaopms!814
2021-12-08 00:30:23 +00:00
zenggang
5e006ac204 * Finish task#45434 2021-12-07 09:40:28 +00:00
zenggang
4b83b4bee6 * Adjust code 2021-12-07 09:13:17 +00:00
zenggang
e79f4b28ea * Adjust code 2021-12-07 09:08:56 +00:00
zenggang
58320d3756 Merge branch 'sprint/devops16_45500' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/devops16_45500 2021-12-07 09:05:28 +00:00
zenggang
1246c4f15d * Adjust code 2021-12-07 09:04:49 +00:00
李玉春
bb44039a30 Merge branch 'sprint/devops16' into 'sprint/devops16_45500'
# Conflicts:
#   module/gitlab/control.php
2021-12-07 08:54:25 +00:00