Commit Graph

648 Commits

Author SHA1 Message Date
caoyanyi
ccc7f6389a * Fix bug #19436. 2022-02-11 06:36:38 +00:00
caoyanyi
cc693d6c68 * Fix bug #19418. 2022-02-11 02:00:17 +00:00
caoyanyi
d551fa882f * Modify form validate. 2022-02-11 01:59:00 +00:00
caoyanyi
ddb9cca1d5 * Modify language. 2022-02-11 01:38:22 +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
583dd0bcd8 * Modify data type. 2022-02-09 05:28:26 +00:00
caoyanyi
8b2dfe101b * Modify config data. 2022-02-09 05:26:27 +00:00
王怡栋
ea2d66f7de Merge branch 'devops21_liyuchun' into 'devops21'
Finish task #48616,#48617.

See merge request easycorp/zentaopms!1735
2022-02-09 05:04:48 +00:00
caoyanyi
29a08fae7d * Modify version compare. 2022-02-09 03:11:47 +00:00
liyuchun
04edbef345 * Finish task #48616. 2022-02-09 10:31:02 +08:00
liyuchun
845b7a6417 * Finish task #48617. 2022-02-09 10:21:05 +08:00
liyuchun
a27c922f05 * Adjsut code style. 2022-02-09 10:00:57 +08:00
liyuchun
23cb9b41ef * Finish task #48618. 2022-02-09 09:38:47 +08:00
liyuchun
a8db9fe1cd * Finish task #48618. 2022-02-08 17:44:02 +08:00
caoyanyi
cd560f74b3 * Finish task #48614. 2022-02-08 05:39:57 +00:00
caoyanyi
372ca9b390 * Finish task #48619. 2022-02-08 05:21:35 +00:00
caoyanyi
a5f4950d37 * Finish task #48615. 2022-02-08 05:20:49 +00:00
liyuchun
9ac6ee3697 * Adjsut style. 2022-02-07 10:38:38 +08:00
caoyanyi
894237885c * Adjust code. 2022-01-27 03:20:43 +00:00
caoyanyi
8e2db7b2cb * Add testcase. 2022-01-27 03:15:48 +00:00
李玉春
4237ad1b7b Merge branch 'devops_caoyanyi' into 'master'
* Modify user bind style.

See merge request easycorp/zentaopms!1632
2022-01-26 02:21:21 +00:00
caoyanyi
0cebd0982e * Modify user bind style. 2022-01-26 02:05:33 +00:00
zenggang
9d35e580eb *Adjust code 2022-01-26 02:03:36 +00:00
zenggang
ce37bf9985 * Fix bug#18978 2022-01-26 01:58:00 +00:00
liyuchun
d95187f42b * Fix error. 2022-01-26 09:01:40 +08: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
4e1b20e9c8 * Adjust code. 2022-01-25 08:25:40 +00:00
caoyanyi
42c0a2f115 * Modify root token check. 2022-01-25 08:23:28 +00:00
李玉春
6507742185 Merge branch 'devops20_zenggang' into 'devops20'
zg:Finish task#48107,48106,48105,48103 and adjust code

See merge request easycorp/zentaopms!1580
2022-01-25 02:43:47 +00:00
zenggang
5183b24bd0 * Adjust code 2022-01-25 02:37:51 +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
zenggang
4ab46cb2ea *Finish task#48107,48106,48105,48103 and adjust code 2022-01-25 01:13:49 +00: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
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
李玉春
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
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
caoyanyi
e673ccf33f * Finish task #48099,48097. 2022-01-24 05:53:16 +00:00