Commit Graph
524 Commits
Author SHA1 Message Date
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
caoyanyi 9d418966c7 * Modify browse check. 2022-08-12 17:04:29 +08:00
caoyanyi 04780426db * Add branch remove. 2022-08-12 16:56:58 +08:00
caoyanyi 1779f04b4d * Modify mr save log. 2022-08-12 16:45:31 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
caoyanyi 3cc56c314d * Adjust codes. 2022-08-12 14:27:08 +08:00
caoyanyi 9bf8e1925a * Modify gogos check. 2022-08-12 14:23:19 +08:00
caoyanyi b0ad47a7e9 * Modify edit mr page. 2022-08-11 16:49:11 +08:00
caoyanyi e45d44ccaa Merge branch 'master' into zenops_41 2022-08-11 16:04:36 +08:00
caoyanyi 0e6bc3432e * Modify mr error. 2022-08-11 15:59:51 +08:00
caoyanyi 22a6755bfe * Modify edit mr. 2022-08-11 14:26:04 +08:00
caoyanyi 5011a49dc0 * Modify edit mr. 2022-08-11 14:02:14 +08:00
caoyanyi c2aec6c152 * Add Gogs mr param. 2022-08-11 13:43:07 +08:00
caoyanyi 0b714797e9 * Adjust code. 2022-08-04 08:44:34 +08:00
caoyanyi 7a12986ba1 * Hide gogs mr. 2022-08-04 08:42:57 +08:00
caoyanyi 59a1377e5a * Adjust codes. 2022-08-03 13:52:51 +08:00
caoyanyi eaf6fcdb44 * Adjust codes. 2022-08-01 16:21:05 +08:00
caoyanyi 4b1dde8c7e * Modify gogs repo. 2022-08-01 15:40:55 +08:00
caoyanyi 5493b37c61 * Fix bug #25825. 2022-07-28 13:34:51 +08:00
caoyanyi d9b1d038eb * Modify page style and some bug. 2022-07-28 11:31:24 +08:00
caoyanyi a0d16d3353 * Modify page style. 2022-07-27 14:50:09 +08:00
caoyanyi 87badf85e5 * Optimize pages. 2022-07-27 13:57:27 +08:00
caoyanyi 3b3bf589f9 * Adjust codes. 2022-07-27 08:27:57 +08:00
caoyanyi 91a99a6cdb * Modify mr diff. 2022-07-26 15:21:03 +08:00
caoyanyi 542156de2a * Add actions. 2022-07-26 14:54:48 +08:00
caoyanyi a1ec9e1d9f * Modify css. 2022-07-26 14:40:39 +08:00