Commit Graph

670 Commits

Author SHA1 Message Date
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
李玉春
c28399fe0e Merge branch 'devops24_cyy' into 'devops24'
完成任务 #50656,50763

See merge request easycorp/zentaopms!2286
2022-03-16 01:47:20 +00:00
liyuchun
ab5910454b * Fix bug #20743,#20209. 2022-03-15 08:40:33 +08:00
caoyanyi
fb27a0a2b9 * Finish task #50673. 2022-03-14 16:52:44 +08:00
李玉春
645190c141 Merge branch 'devops24_cyy' into 'devops24'
处理bug #50686, #50678, #50668.

See merge request easycorp/zentaopms!2240
2022-03-14 08:35:14 +00:00
李玉春
51eaf6cc23 Merge branch 'devops23_cyy_50075' into 'devops24'
Devops23 cyy 50075

See merge request easycorp/zentaopms!2234
2022-03-14 08:28:01 +00:00
caoyanyi
4973f92006 * Add locate url. 2022-03-14 16:21:24 +08:00
caoyanyi
c025aab757 * Modify auth check. 2022-03-07 10:11:29 +08:00
王怡栋
58b1f576bc * fix for api and remove bom and adjust for php8.1. 2022-03-03 10:19:58 +08:00
caoyanyi
8bd5c0a0c9 * Revert code. 2022-03-02 09:25:13 +08:00
caoyanyi
8a2c1207fd * Finish task #50075. 2022-03-02 09:21:58 +08:00
孙广明
df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
caoyanyi
8ad5a1236f * Modify hidden param. 2022-02-24 10:34:41 +08:00
caoyanyi
4a718ac2bc * Modify branch encode. 2022-02-24 10:17:55 +08:00
zenggang
574b5400d1 * Fix bug#19866 2022-02-23 07:14:06 +00:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
孙广明
9e171958bf Merge branch 'liyuchun_bug_19323' into 'master'
* Fix bug #19323.

See merge request easycorp/zentaopms!1800
2022-02-15 05:27:00 +00:00
liyuchun
7c3c7d1662 * Fix bug #19383. 2022-02-15 08:26:50 +08:00
caoyanyi
7fc3b6d4e9 * Modify test case. 2022-02-14 15:19:07 +08:00
liyuchun
5583b62fc9 Merge branch 'devops21' 2022-02-14 10:20:11 +08:00
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
liyuchun
8ed093d0fe * Fix bug. 2022-02-09 12:59:50 +08: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