 李玉春
|
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 |
|
|
tianshujie
|
1c60beb471
|
* Finish task #48005.
|
2022-01-19 16:02:34 +08:00 |
|
|
tianshujie
|
2b08d2f07a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/183_tianshujie_48005
|
2022-01-19 16:02:27 +08:00 |
|
|
朱金勇
|
4665190e43
|
Merge branch 'sprint/183_zhouxudong_trans47955' into 'master'
Sprint/183 zhouxudong trans47955
See merge request easycorp/zentaopms!1500
|
2022-01-19 07:57:39 +00:00 |
|
|
周旭东
|
09ade37ec6
|
Update index.en.css
|
2022-01-19 07:52:31 +00:00 |
|
|
zhouxudong
|
93aafabf4f
|
*Finish task #47955 #47957.
|
2022-01-19 15:50:41 +08:00 |
|
|
zhouxudong
|
cb0b074717
|
*Finish task #47955 #47957.
|
2022-01-19 15:43:28 +08:00 |
|
|
朱金勇
|
4cb8d68e80
|
Merge branch 'sprint/183_zhouxudong_trans47958' into 'master'
*Finish task #47958.
See merge request easycorp/zentaopms!1497
|
2022-01-19 06:51:01 +00:00 |
|
|
zhouxudong
|
a7fa427b91
|
*Finish task #47958.
|
2022-01-19 14:29:23 +08:00 |
|
|
tianshujie
|
0adde5be67
|
* Remove useless code.
|
2022-01-19 13:56:50 +08:00 |
|
|
王怡栋
|
e535b6a423
|
Merge branch 'sprint/183_tianshujie_47981' into 'master'
* Finish task #47981.
See merge request easycorp/zentaopms!1495
|
2022-01-19 05:48:00 +00:00 |
|
|
tianshujie
|
caf4e77f84
|
* Finish task #47981.
|
2022-01-19 13:32:39 +08:00 |
|
|
孙广明
|
daf0d59227
|
Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Fix bug and add sql file.
See merge request easycorp/zentaopms!1494
|
2022-01-19 05:16:34 +00:00 |
|
|
liumengyi
|
cca28df709
|
* Fix bug and add sql file.
|
2022-01-19 13:13:08 +08:00 |
|
|
孙广明
|
fdac2458cb
|
Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18481.
See merge request easycorp/zentaopms!1490
|
2022-01-19 03:17:59 +00:00 |
|
|
liumengyi
|
361d245ac6
|
* Remove useless variables.
|
2022-01-19 11:13:43 +08:00 |
|
|
liumengyi
|
2d10aedf4b
|
* Remove useless code.
|
2022-01-19 09:04:11 +08:00 |
|
|
孙广明
|
0c17431df8
|
Merge branch 'sprint/182_tianshujie_18692' into 'master'
* Fix bug #18692.
See merge request easycorp/zentaopms!1491
|
2022-01-19 01:02:24 +00:00 |
|
|
王怡栋
|
f3a6122cbe
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!1492
|
2022-01-19 01:01:42 +00:00 |
|
|
liumengyi
|
a1c6cfadcc
|
* Modify required item judgment method.
|
2022-01-19 09:01:29 +08:00 |
|
|
tianshujie
|
bb1d4c3839
|
* Adjust code of kanban.
|
2022-01-19 09:01:12 +08:00 |
|