 liyuchun
|
2b71ad28de
|
* Finish task #48094.
|
2022-01-25 14:19:24 +08:00 |
|
|
孙广明
|
461940c671
|
Merge branch 'devops20_liyuchun' into 'devops20'
* Finish task #48096.
See merge request easycorp/zentaopms!1567
|
2022-01-24 09:23:16 +00:00 |
|
|
李玉春
|
8558dde080
|
Merge branch 'devops_caoyanyi_bug' into 'devops20'
cyy: Fix bug.
See merge request easycorp/zentaopms!1574
|
2022-01-24 09:21:59 +00:00 |
|
|
liyuchun
|
eba799b60f
|
* Fix bug #18492.
|
2022-01-24 17:20:19 +08:00 |
|
|
caoyanyi
|
5de03afa3a
|
* fix bug #18922.
|
2022-01-24 09:06:10 +00:00 |
|
|
caoyanyi
|
da20e9dfa8
|
* Fix bug #18920,18919,18918.
|
2022-01-24 08:36:47 +00:00 |
|
|
李玉春
|
39022c7ef3
|
Merge branch 'devops_caoyanyi' into 'devops20'
* Modify auth check.
See merge request easycorp/zentaopms!1570
|
2022-01-24 08:21:47 +00:00 |
|
|
caoyanyi
|
c077f9ff4d
|
* Modify auth check.
|
2022-01-24 08:20:40 +00:00 |
|
|
李玉春
|
4bc28cb62f
|
Merge branch 'devops_caoyanyi' into 'devops20'
* Modify isset check.
See merge request easycorp/zentaopms!1568
|
2022-01-24 08:12:54 +00:00 |
|
|
caoyanyi
|
a2a1df2b9e
|
* Modify isset check.
|
2022-01-24 08:08:24 +00:00 |
|
|
李玉春
|
480e08f2d0
|
Merge branch 'devops_caoyanyi' into 'devops20'
Devops caoyanyi
See merge request easycorp/zentaopms!1566
|
2022-01-24 08:03:00 +00:00 |
|
|
liyuchun
|
acbb957484
|
* Finish task #48096.
|
2022-01-24 15:54:27 +08:00 |
|
|
caoyanyi
|
d0b289ed21
|
* Finish task #48108.
|
2022-01-24 07:46:22 +00:00 |
|
|
caoyanyi
|
6e567482e2
|
* Modify group access.
|
2022-01-24 07:46:08 +00:00 |
|
|
liyuchun
|
f0907d2f11
|
* Fix error.
|
2022-01-24 14:32:31 +08:00 |
|
|
李玉春
|
033763cceb
|
Merge branch 'devops20_caoyanyi' into 'devops20'
Devops20 caoyanyi
See merge request easycorp/zentaopms!1563
|
2022-01-24 06:31:27 +00:00 |
|
|
caoyanyi
|
b20110ba68
|
* Adjust code.
|
2022-01-24 06:31:00 +00:00 |
|
|
caoyanyi
|
9f23e540d9
|
* Modify config data.
|
2022-01-24 06:26:54 +00:00 |
|
|
caoyanyi
|
49f393a684
|
* Remove unused param.
|
2022-01-24 06:23:17 +00:00 |
|
|
caoyanyi
|
19af621cdd
|
* Fix bug #18867.
|
2022-01-24 06:19:34 +00:00 |
|
|
李玉春
|
ddc2cee664
|
Merge branch 'devops20_caoyanyi' into 'devops20'
Devops20 caoyanyi
See merge request easycorp/zentaopms!1560
|
2022-01-24 06:07:03 +00:00 |
|
|
孙广明
|
a887a9edc3
|
Merge branch 'devops20_liyuchun' into 'devops20'
* Finish task #48098.
See merge request easycorp/zentaopms!1557
|
2022-01-24 05:59:45 +00:00 |
|
|
caoyanyi
|
e673ccf33f
|
* Finish task #48099,48097.
|
2022-01-24 05:53:16 +00:00 |
|
|
caoyanyi
|
11a30ec207
|
* Finish task #48100,48102.
|
2022-01-24 05:40:40 +00:00 |
|
|
liyuchun
|
a567a2e6ea
|
* Finish task #48098.
|
2022-01-24 13:37:46 +08:00 |
|
|
孙广明
|
5d32bccec8
|
Merge branch 'devops20_liyuchun' into 'devops20'
* Check user access.
See merge request easycorp/zentaopms!1552
|
2022-01-24 05:02:51 +00:00 |
|
|
liyuchun
|
58a692337a
|
* Check user access.
|
2022-01-24 10:59:21 +08:00 |
|
|
李玉春
|
c95b928a54
|
Merge branch 'devops20_48097' into 'devops20'
* Modify project access check.
See merge request easycorp/zentaopms!1544
|
2022-01-21 09:20:51 +00:00 |
|
|
caoyanyi
|
a0209a41da
|
* Modify project access check.
|
2022-01-21 07:04:33 +00:00 |
|
|
李玉春
|
80134fd1bb
|
Merge branch 'devops20_48104' into 'devops20'
zg:任务48104
See merge request easycorp/zentaopms!1525
|
2022-01-21 06:35:19 +00:00 |
|
|
zenggang
|
47e13757a8
|
* Adjust code
|
2022-01-21 05:11:52 +00:00 |
|
|
李玉春
|
0f4d22a7a5
|
Merge branch 'devops_caoyanyi' into 'devops20'
* Finish task #48109.
See merge request easycorp/zentaopms!1534
|
2022-01-21 03:07:40 +00:00 |
|
|
liyuchun
|
13a49268e7
|
* Adjust check is bind user.
|
2022-01-21 11:06:58 +08:00 |
|
|
liyuchun
|
1a26aeba04
|
* Define gitlab access level.
|
2022-01-21 10:54:14 +08:00 |
|
|
zenggang
|
e315a62440
|
* Adjust code
|
2022-01-21 02:38:51 +00:00 |
|
|
王怡栋
|
dc6461a00d
|
Merge branch 'devops20_liyuchun' into 'devops20'
lyc:完成任务48095
See merge request easycorp/zentaopms!1533
|
2022-01-21 01:54:57 +00:00 |
|
|
liyuchun
|
bb7e0b9fc6
|
* Finish task #48095.
|
2022-01-21 09:52:27 +08:00 |
|
|
zenggang
|
36c97752b4
|
* Finish task#48104
|
2022-01-20 09:25:44 +00:00 |
|
|
caoyanyi
|
220e149107
|
* Finish task #48109.
|
2022-01-20 07:40:33 +00:00 |
|
|
liyuchun
|
ff88318735
|
Merge branch 'devops_caoyanyi' into devops20
|
2022-01-20 14:11:22 +08:00 |
|
|
李玉春
|
7942d9a886
|
Merge branch 'devops20' into 'devops_caoyanyi'
# Conflicts:
# module/gitlab/model.php
|
2022-01-20 06:10:57 +00:00 |
|
|
caoyanyi
|
f87294adf7
|
* Modify page error.
|
2022-01-20 05:37:33 +00:00 |
|
|
王怡栋
|
03cc2f1346
|
Merge branch 'devops20_liyuchun' into 'devops20'
* Add sudo in gitlab api url.
See merge request easycorp/zentaopms!1514
|
2022-01-20 05:28:26 +00:00 |
|
|
liyuchun
|
b9c90fcd25
|
* Adjust bind user.
|
2022-01-20 13:27:31 +08:00 |
|
|
liyuchun
|
c561a9b666
|
* Add sudo in gitlab api url.
|
2022-01-20 13:11:40 +08:00 |
|
|
liyuchun
|
7e96eb9f68
|
Merge branch 'devops19'
|
2022-01-19 16:55:57 +08:00 |
|
|
孙广明
|
68fb902692
|
Merge branch 'sprint/183_tianshujie_48005' into 'master'
* Finish task #48005.
See merge request easycorp/zentaopms!1501
|
2022-01-19 08:44:06 +00:00 |
|
|
tianshujie
|
5bd18ec761
|
* Add conditional judgment.
|
2022-01-19 16:43:00 +08:00 |
|
|
tianshujie
|
131cdb614c
|
* Modify card query logic.
|
2022-01-19 16:33:57 +08:00 |
|
|
zhujinyong
|
74a9fedbd2
|
* Fix install function.
|
2022-01-19 16:22:44 +08:00 |
|