Commit Graph
572 Commits
Author SHA1 Message Date
caoyanyi 47e6e1c543 * Modify gitlab token check and repo create gitlab list. 2022-06-29 10:23:13 +08:00
李玉春 c12226f606 Merge branch 'cyy_style' into 'master'
* Modify style for select.

See merge request easycorp/zentaopms!4124
2022-06-24 06:29:55 +00:00
caoyanyi 7ce833f5ad * Modify style for select. 2022-06-24 08:48:02 +08:00
李玉春 267803004a Merge branch 'cyy_optimize' into 'master'
* Adjust style.

See merge request easycorp/zentaopms!4110
2022-06-23 09:21:33 +00:00
caoyanyi b85f30b3ac * Adjust style. 2022-06-23 15:25:53 +08:00
liyuchun 5355c2cc98 * Add language. 2022-06-23 05:30:58 +00:00
孙广明 124701de98 Merge branch 'master' into 'liyuchun_57658'
# Conflicts:
#   module/repo/control.php
2022-06-23 01:14:27 +00:00
李玉春 69fa9aa6ed Merge branch 'cyy_optimize' into 'master'
* Adjust style and codes.

See merge request easycorp/zentaopms!4073
2022-06-23 01:02:57 +00:00
caoyanyi 08a3e4e816 * Adjust code. 2022-06-23 08:48:22 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
caoyanyi dd5cf777d9 * Modify function name. 2022-06-23 08:23:55 +08:00
李玉春 e308778583 Merge branch 'cyy_23862' into 'master'
* Fix bug #23862.

See merge request easycorp/zentaopms!4064
2022-06-23 00:16:10 +00:00
caoyanyi 0c894a4355 * Adjust style and codes. 2022-06-22 16:32:57 +08:00
zhouxin 0e1dff66a8 * Adjust code. 2022-06-22 07:30:56 +00:00
李玉春 497b32f627 Merge branch 'zenops_36' into 'master'
Zenops 36

See merge request easycorp/zentaopms!4066
2022-06-22 07:18:41 +00:00
liyuchun 4c6ac43ca2 * Finish task #57658. 2022-06-22 07:16:38 +00:00
caoyanyi dee75b05f1 * Fix bug #23862. 2022-06-22 13:49:31 +08:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
zhouxin 4cf1630ae3 * Adjust code. 2022-06-22 02:55:18 +00:00
zhouxin 46cef64035 * Add badge. 2022-06-22 02:48:36 +00:00
zhouxin a29205235b * Finish task #57655. 2022-06-22 01:23:19 +00:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
liyuchun 6076785841 * Show default branch. 2022-06-21 05:37:24 +00:00
caoyanyi 8d16be79c4 * Modify page locate. 2022-06-16 12:04:06 +08:00
朱金勇 1a5b537ec7 Merge branch 'cyy_zcli' into 'master'
* Add api for jobs and repos.

See merge request easycorp/zentaopms!3941
2022-06-15 09:54:22 +00:00
caoyanyi 0486181ed7 * Add api for jobs and repos. 2022-06-15 15:51:37 +08:00
zenggang 18449b6c13 * Finish task #57159 2022-06-14 06:32:41 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
孙广明 d6ae330c2e Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug for cli.

See merge request easycorp/zentaopms!3607
2022-05-26 05:45:59 +00:00
liyuchun fb771e6bc5 * Fix bug #22956. 2022-05-26 05:42:50 +00:00
tianshujie fe8758c4ca * Fix bug #22208. 2022-05-25 17:27:14 +08:00
王怡栋 14ece79b3e Merge branch 'spring/master_zhouxudong_54470' into 'master'
* Finish task #54470.

See merge request easycorp/zentaopms!3547
2022-05-25 08:04:57 +00:00
zhouxudong fcf8218569 * Finish task #54470. 2022-05-25 07:57:57 +00:00
zhouxudong 049c774680 * Finish task #54983. 2022-05-25 07:12:30 +00:00
zhouxudong 1a137e058e * Finish task #54470. 2022-05-20 06:12:29 +00:00
zhouxudong caaaa62cd2 * Finish task #54470. 2022-05-20 06:11:40 +00:00
zhouxudong 6ee6f5b996 * Finish task #54470. 2022-05-20 05:59:51 +00:00
liyuchun 9d05eee2a0 * Fix bug #22666. 2022-05-20 01:18:12 +00:00
caoyanyi 53b52b7101 * Fix bug #22698. 2022-05-20 09:04:53 +08:00
孙广明 fe6c8d18a2 Merge branch 'sprint/190_zg_54208' into 'master'
* Finish task#54208

See merge request easycorp/zentaopms!3469
2022-05-18 03:11:51 +00:00
zenggang ba542db897 * Finish task#54208 2022-05-18 02:25:43 +00:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
mayue 156ebf701f * Optimize code. 2022-05-13 06:22:39 +00:00
mayue 3581e32357 * Fix bug #22412. 2022-05-13 06:14:05 +00:00
zenggang ac8225544f * Fix refresh jump to other branches 2022-04-29 02:43:57 +00:00
zenggang 073b30159c * Fix bug#21498 2022-04-28 09:53:39 +00:00
李玉春 af548546d7 Merge branch 'bug_2939' into 'master'
Fix bug#2939,18683

See merge request easycorp/zentaopms!3189
2022-04-28 08:22:17 +00:00
zenggang 45b7cbd186 * Fix bug#2939,18683 2022-04-28 06:23:26 +00:00
孙广明 1cb36eb72c Merge branch 'liyuchun_fixbug_22074' into 'master'
* Fix bug #22075.

See merge request easycorp/zentaopms!3185
2022-04-28 06:22:29 +00:00