Commit Graph

207 Commits

Author SHA1 Message Date
caoyanyi
bbc2fdce3a * Fix bug #25147,25148. 2022-07-13 10:20:19 +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
8e2c831722 * Modify param name. 2022-07-12 09:51:36 +08:00
caoyanyi
e5ffd04c34 * Finish task #60565,60566. 2022-07-12 09:45:31 +08:00
caoyanyi
fc7404e096 * Modify back btn. 2022-07-07 10:08:28 +08:00
caoyanyi
3ece68c081 * Modify user edit. 2022-07-07 09:42:50 +08:00
caoyanyi
17eda754f9 * Fix bug #24829. 2022-07-06 14:17:25 +08:00
caoyanyi
7a3fda688a * Fix bug #24800. 2022-07-06 13:45:26 +08:00
caoyanyi
0d38d331d3 * Modify actions style. 2022-07-06 10:37:11 +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
b0897e1847 * Adjust codes. 2022-07-05 08:43:37 +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
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liyuchun
e0a2088ce8 * Fix bug #20939. 2022-03-29 16:20:43 +08:00
liyuchun
9f74fe748f * Fix bug #20804,20946. 2022-03-29 09:34:09 +08:00
liyuchun
3a566fb870 * Fix bug. 2022-03-25 13:39:12 +08:00
liyuchun
0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
zenggang
70d00fad9e * Code for task#50697,50685 2022-03-17 03:07:38 +00:00
liyuchun
15e03af077 * Fix bug #20833. 2022-03-16 13:36:28 +08:00
caoyanyi
fb27a0a2b9 * Finish task #50673. 2022-03-14 16:52:44 +08:00
caoyanyi
4973f92006 * Add locate url. 2022-03-14 16:21:24 +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
李玉春
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
王怡栋
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
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
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
372ca9b390 * Finish task #48619. 2022-02-08 05:21:35 +00:00
liyuchun
9ac6ee3697 * Adjsut style. 2022-02-07 10:38:38 +08:00
caoyanyi
0cebd0982e * Modify user bind style. 2022-01-26 02:05:33 +00:00
caoyanyi
efbb0fa13e * Modify gitlab group access. 2022-01-26 00:46:20 +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
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
李玉春
ddc2cee664 Merge branch 'devops20_caoyanyi' into 'devops20'
Devops20 caoyanyi

See merge request easycorp/zentaopms!1560
2022-01-24 06:07:03 +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
caoyanyi
a0209a41da * Modify project access check. 2022-01-21 07:04:33 +00:00
caoyanyi
220e149107 * Finish task #48109. 2022-01-20 07:40:33 +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
caoyanyi
e2d8d506b3 * Fix bug #18370,18371,18372,18379. 2022-01-13 05:08:08 +00:00