Commit Graph
549 Commits
Author SHA1 Message Date
zenggang 29f2f5187b * Merge 18.x 2023-08-28 10:27:22 +00:00
zhaoke 8d26480b51 * Adjust tabbar style of devops module. 2023-08-28 08:33:55 +08:00
zhaoke 565cadee20 * Adjust css style of repo module. 2023-08-25 11:17:25 +08:00
zenggang 47b89333c9 * Adjust devops 2023-08-18 07:05:02 +00:00
zenggang eb402399a7 * Finish task#100470 2023-08-18 05:45:15 +00:00
zhaoke 910910d796 * Fix bugs of search module. 2023-08-15 17:15:03 +08:00
zhaoke 37688315ad * Fix can not load data in current page when click search button of mr module. 2023-08-11 13:48:27 +08:00
zhaoke 32d5233449 * Fix the issue of file loading failure of repo view page in pathinfo mode. 2023-08-11 10:34:41 +08:00
zhaoke cbade64264 * Fix bug #37039. 2023-08-08 15:36:54 +08:00
zenggang 1784ced2f5 * Fix bugs. 2023-08-08 02:42:37 +00:00
zhaoke 92ee05860b * Fix bug #37082. 2023-08-04 17:19:36 +08:00
zhaoke 813b288763 * Fix bug #36523. 2023-08-04 15:50:10 +08:00
songchenxuan 01fd8cc08c * Add a param for story-getBySearch. 2023-08-04 11:05:59 +08:00
zhaoke 5379b95a20 * Refactor gitea,gogs,jenkins module. 2023-08-02 14:00:54 +08:00
zhaoke cc053b9d48 * Add buildZinForm of search. 2023-08-02 11:03:18 +08:00
zhaoke 078804d5ed * Reload page when edit comment. 2023-08-02 08:49:56 +08:00
zhaoke 1cb5a15b9d * Refactor mr module. 2023-08-01 09:39:39 +08:00
chaideqing a3f719d219 * Fix bug#32938, code diff is not accurate. 2023-05-24 13:29:53 +08:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
liumengyi 4f9a284fb6 * Rename the privilege of mr-view. 2023-04-14 13:46:15 +08:00
liumengyi 2a352ade87 * Rename the privilege of mr-browse. 2023-04-14 13:43:56 +08:00
caoyanyi 63fa9d9fd5 * Modify mr projects get. 2023-04-13 16:00:40 +08:00
caoyanyi b883f56dfc * Compatible with IE. 2023-03-30 08:30:17 +08:00
zenggang df52363be3 * Fix bug#33020 2023-03-16 07:10:56 +00:00
曾刚 2da060b171 Gitlab optimize 2023-03-09 08:05:10 +00:00
tianshujie aeb2ae52f8 * Modify the filter label of the mr Module. 2023-02-21 16:49:09 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
caoyanyi cfb0327a55 * Modify error for mr relation. 2023-02-13 14:41:56 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
zhouxin bf3ef7a9ab * Resolve feedback #843. 2022-12-29 06:41:40 +00:00
caoyanyi 42aea64d75 * Fix bug #30947. 2022-12-26 10:58:56 +08:00
caoyanyi f58e24e6fc Merge branch 'master' into zenops_46 2022-12-02 10:04:48 +08:00
wangyidong 283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00
liyuchun 539c7a776f * Fix bug when link bug to revision. 2022-10-24 17:17:30 +08:00
liyuchun 5177509ee8 * Adjust default style in code diff page. 2022-10-18 11:15:19 +08:00
liyuchun d3aebbbc6f * Fix bug #28487. 2022-10-15 08:51:27 +08:00
liyuchun c3b4618531 * Fix error when link object to revision. 2022-10-11 15:39:34 +08:00
liyuchun 41bddc2893 Merge branch 'master' into zenops_46 2022-10-08 15:22:35 +08:00
李玉春 743595ea83 Merge branch 'master' into 'devops19'
# Conflicts:
#   test/model/mr/create.php
2022-10-08 03:21:38 +00:00
liyuchun 6bed7509e7 Merge branch 'master' into zenops_46 2022-09-29 09:25:12 +08:00
孙广明 09f4edd61f Merge branch 'liyuchun_fixbug_27962' into 'master'
* Fix bug #27962.

See merge request easycorp/zentaopms!5549
2022-09-26 08:52:24 +00:00
liyuchun 6a60c85dc8 * Fix bug #27962. 2022-09-26 16:50:58 +08:00
tianshujie f97e85ee2f * Fix bug #27687. 2022-09-22 14:55:34 +08:00
曹延义 d829edf2c9 * Code for task #69949. 2022-09-20 09:33:12 +08:00
李玉春 84f346f413 Merge branch 'cyy_repo_editor' into 'zenops_44'
* Modify editor linked content style.

See merge request easycorp/zentaopms!5134
2022-08-26 06:12:59 +00:00
caoyanyi 7e9454c815 * Modify icon and page style. 2022-08-26 13:37:24 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
liyuchun 6a4299917d * Fix bug #26413. 2022-08-16 08:53:41 +08:00
孙广明 d7a8b587db Merge branch 'liyuchun_64263' into 'zenops_41'
* Finish task #64263.

See merge request easycorp/zentaopms!4958
2022-08-15 00:22:26 +00:00
liyuchun 32613a2045 * Finish task #64263. 2022-08-12 17:10:47 +08:00