Commit Graph

206 Commits

Author SHA1 Message Date
caoyanyi
3d98baf24d * Modify mr create. 2022-07-18 17:23:37 +08:00
孙广明
425a6f8aa5 Merge branch 'liyuchun_60452' into 'zenops_38'
* Finish task #60453.

See merge request easycorp/zentaopms!4474
2022-07-12 09:24:39 +00:00
caoyanyi
ed24e40025 * Modify page error. 2022-07-12 15:36:57 +08:00
liyuchun
6cef93edd9 * Finish task #60453. 2022-07-12 06:30:13 +00:00
caoyanyi
e5ffd04c34 * Finish task #60565,60566. 2022-07-12 09:45:31 +08:00
caoyanyi
e794c59ce1 * Adjust codes. 2022-07-07 09:46:11 +08:00
caoyanyi
3ece68c081 * Modify user edit. 2022-07-07 09:42:50 +08:00
caoyanyi
6c4a58b1a0 * Adjust codes. 2022-07-06 16:02:50 +08:00
caoyanyi
5e883406fe * Fix bug #24847. 2022-07-06 14:02:33 +08:00
李玉春
7838ff2ac6 Merge branch 'cyy_gitlab' into 'master'
* Modify gitlab access check.

See merge request easycorp/zentaopms!4346
2022-07-06 00:17:14 +00:00
caoyanyi
6557ff6ddf * Modify gitlab access check. 2022-07-05 14:47:40 +08:00
caoyanyi
4031944a73 Merge branch 'master' into cyy_59436 2022-07-05 09:10:00 +08:00
caoyanyi
80bbce28ae * Finish task #59436,59435. 2022-07-04 15:58:16 +08:00
caoyanyi
018ba38397 * Finish task #59441,59442,59443,59444,59445. 2022-07-04 14:53:16 +08:00
caoyanyi
47e6e1c543 * Modify gitlab token check and repo create gitlab list. 2022-06-29 10:23:13 +08:00
caoyanyi
73472acf0a * Modify apit params. 2022-06-27 13:07:22 +08:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liyuchun
356aa74ca1 * Fix bug when create gitlab server. 2022-05-11 06:58:54 +00:00
liyuchun
e0a2088ce8 * Fix bug #20939. 2022-03-29 16:20:43 +08:00
zenggang
70d00fad9e * Code for task#50697,50685 2022-03-17 03:07:38 +00:00
zenggang
4464d75123 * Finish task#50685,50680,50672 2022-03-16 05:20:20 +00:00
liyuchun
ab5910454b * Fix bug #20743,#20209. 2022-03-15 08:40:33 +08:00
caoyanyi
c025aab757 * Modify auth check. 2022-03-07 10:11:29 +08:00
孙广明
df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
caoyanyi
4a718ac2bc * Modify branch encode. 2022-02-24 10:17:55 +08:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
caoyanyi
d551fa882f * Modify form validate. 2022-02-11 01:59:00 +00:00
caoyanyi
b77129e525 * Modify host check. 2022-02-11 01:20:51 +00:00
caoyanyi
7be47b221e * Modify language. 2022-02-10 09:22:20 +00:00
李玉春
ab5ddcf710 Merge branch 'devops_caoyanyi_gitlab' into 'devops21'
Devops caoyanyi gitlab

See merge request easycorp/zentaopms!1736
2022-02-09 07:07:20 +00:00
caoyanyi
8b2dfe101b * Modify config data. 2022-02-09 05:26:27 +00:00
caoyanyi
29a08fae7d * Modify version compare. 2022-02-09 03:11:47 +00:00
liyuchun
845b7a6417 * Finish task #48617. 2022-02-09 10:21:05 +08:00
caoyanyi
cd560f74b3 * Finish task #48614. 2022-02-08 05:39:57 +00:00
caoyanyi
efbb0fa13e * Modify gitlab group access. 2022-01-26 00:46:20 +00:00
liyuchun
555fbaddef Merge branch 'devops20' 2022-01-25 16:55:51 +08:00
caoyanyi
42c0a2f115 * Modify root token check. 2022-01-25 08:23:28 +00:00
caoyanyi
642145cc16 * Modify die to return print. 2022-01-25 01:44:02 +00:00
caoyanyi
7eb79b6256 * Fix bug #18932. 2022-01-25 01:38:24 +00:00
caoyanyi
da20e9dfa8 * Fix bug #18920,18919,18918. 2022-01-24 08:36:47 +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
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
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
李玉春
ddc2cee664 Merge branch 'devops20_caoyanyi' into 'devops20'
Devops20 caoyanyi

See merge request easycorp/zentaopms!1560
2022-01-24 06:07:03 +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