Commit Graph
39 Commits
Author SHA1 Message Date
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
sunjun c67dba8d47 fixbug #16662 2022-03-21 08:54:02 +08:00
liyuchun ab5910454b * Fix bug #20743,#20209. 2022-03-15 08:40:33 +08:00
孙广明 57651b969a Merge branch 'devops24_liyuchun_50709' into 'devops24'
完成任务#50709

See merge request easycorp/zentaopms!2236
2022-03-14 08:44:38 +00:00
liyuchun b25e7a1fe7 * Fix bug #20209. 2022-03-14 16:38:41 +08:00
caoyanyi 0a2a96915b * Modify default value. 2022-03-14 15:59:27 +08:00
dingguodong 56b030f2a6 * Put gitlab to first position and reformat codes. 2021-08-03 11:13:13 +08:00
dingguodong 6b73cfc0bc * Optimize back button. 2021-08-02 16:28:15 +08:00
dingguodong 7305db37c1 * Revert repo module from jihu branch's feature. 2021-07-23 10:09:14 +08:00
lichengjun 4e95021b08 Fix Bug ID 40660. 2021-07-16 14:32:26 +08:00
lichengjun ecbcecd463 *Fix code format. 2021-07-14 15:21:05 +08:00
dingguodong 61debf97e9 + Add some tips for user when adding gitlab server. 2021-06-11 11:41:04 +08:00
Guanxiying 1847e38c73 * Finish task 39216. 2021-06-10 14:08:06 +08:00
wangyidong e9fe38f8d4 * fix error. 2021-05-06 15:35:32 +08:00
Guanxiying 87f49eb3e1 * Merge gitlab codes. 2021-04-14 13:19:33 +08:00
zhujinyong b6a27819f3 * Fix menu. 2021-03-18 08:55:22 +08:00
zhujinyong c869d88cc2 * Fix css style of *.html.php 2021-03-10 23:35:56 +08:00
Yagami 285320d95a * Let repo link product. 2020-12-25 13:07:39 +08:00
tianshujie98 c1fb6ddf0e * Finish task #8651. 2020-12-16 14:39:19 +08:00
Yagami 225189e217 * Fix details. 2020-11-02 13:22:57 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
sgm0422 01d630040b * Add program to repo. 2020-07-01 16:57:13 +08:00
wangyidong 576c22593d * finish task #7076. 2020-04-30 15:31:26 +08:00
wangyidong 420a60ea8b * finish task #6935. 2020-02-28 16:25:59 +08:00
wangyidong 172a9724e2 * code for task #6912,6913,6914,6916. 2020-02-28 15:05:56 +08:00
wangyidong e2c02c246b Merge branch 'master' into zentaopms_12.0.1 2020-02-26 18:27:08 +08:00
wangyidong c13b25c318 * adjust repo create and edit page. 2020-02-12 09:00:25 +08:00
aaronchen2k 77eddecece update 2020-02-10 15:06:52 +08:00
wangyidong 68b0fa26f3 * marge from master. 2020-02-07 10:58:58 +08:00
aaronchen2k dda120936d change git and svn to use the encoding defined in repo table 2020-02-03 17:42:48 +08:00
aaronchen2k 56392dd151 english translation 2020-02-03 14:35:36 +08:00
aaronchen2k b6ec537ec3 hide account fields in create, edit page for git 2020-02-03 09:15:56 +08:00
aaronchen2k f8d9a16082 jenkins password encrypt 2020-02-01 18:28:50 +08:00
aaronchen2k b713feabc5 test and fix issues about svn 2020-02-01 09:52:58 +08:00
aaronchen2k 045ce83aaa enable git sync in sys.cron 2020-01-31 21:19:43 +08:00
aaronchen2k 57b0bd7c6a changes for original repo and ci models combination 2020-01-31 20:51:27 +08:00
aaronchen2k 9e8b73a6e3 update menu etc. 2020-01-23 16:30:22 +08:00
wangyidong 6630dd0bb7 * code for task #6708. 2019-12-10 13:55:01 +08:00