Commit Graph
286 Commits
Author SHA1 Message Date
caoyanyi 7c6cfa6241 * [misc] adjust mr action for sync. 2024-10-09 11:01:37 +08:00
caoyanyi 5ea58dc64d * [misc] adjust mr edited locate. 2024-09-25 14:13:20 +08:00
caoyanyi 83184a63be * [misc] adjust mr result after the operate. 2024-09-25 09:09:09 +08:00
caoyanyi cdb4fa7ff7 * [task#128734,doing,0.1h] adjust link object locate addr. 2024-09-24 14:55:25 +08:00
caoyanyi d6fca0cb21 * [task#128737,doing,0.5h] adjust action for pull request. 2024-09-24 08:36:31 +08:00
caoyanyi 55598b272c * [task#128739,doing,0.2h] adjust locate page for mr operate. 2024-09-23 16:54:47 +08:00
caoyanyi 06b9459a31 * [task#128733,doing,1h] adjust mr and pullreq list data. 2024-09-23 15:10:29 +08:00
caoyanyi 54481a22fd * [task#128357,done,0.5h] adjust mr create params. 2024-09-13 10:53:28 +08:00
caoyanyi 226de85fdf * [misc] adjust session close logic for mr. 2024-08-28 14:08:14 +08:00
caoyanyi 9546284a31 * [misc] add session close for mr. 2024-07-31 11:08:57 +08:00
caoyanyi 920a22af16 * [bug53259] adjust third menu for execution. 2024-07-30 11:09:48 +08:00
caoyanyi 84c7c70197 * [bug#53263] adjust repo 1.5 menu data. 2024-07-30 11:09:48 +08:00
caoyanyi cb163a2e32 * [misc] adjust mr call function name. 2024-06-19 17:15:15 +08:00
caoyanyi 98ceb03d7f - [task#120961,0.5h] delete unused codes for mr. 2024-06-19 16:32:25 +08:00
caoyanyi 8092e761a8 * [bug#50436,0.4h] adjust sync mr status data for gitfox. 2024-05-31 09:40:41 +08:00
dingguodong e03f8d396d * Sync/update the mr with its state and merge_status. 2024-05-30 10:19:15 +08:00
caoyanyi 84b74a00a0 + Add tips for gitea and gogs mr. 2024-05-23 14:22:14 +08:00
caoyanyi b41fb50e06 + Add refresh result tip for mr. 2024-05-20 16:24:13 +08:00
caoyanyi 89b23a4c0d * Adjust mr commmit date check. 2024-05-20 15:31:22 +08:00
caoyanyi 422478e03f + Add commit update tips for mr view. 2024-05-20 15:31:22 +08:00
caoyanyi 518d4a0fb5 + Add job refresh btn for mr view. 2024-05-20 15:31:21 +08:00
caoyanyi b17f3a48d3 + Add exec job method for mr. 2024-05-20 15:31:21 +08:00
caoyanyi 7d6f52a235 - Remove user remote priv check for mr edit. 2024-05-20 15:31:21 +08:00
caoyanyi 56ab463ae0 + Add reviewer for mr view page. 2024-05-20 15:31:20 +08:00
caoyanyi a1ab411e12 + Add actions block for mr diff page. 2024-05-20 15:31:20 +08:00
caoyanyi 9e7f466ce4 * Adjust mr actions for view and commits page. 2024-05-20 15:31:20 +08:00
caoyanyi 90edee6ce0 * Optimize the loading speed of merge request pages. 2024-05-13 11:14:48 +08:00
liyang 21c8197bb0 * Fix bug #49249, Modify the display mode of repo. 2024-05-10 16:07:50 +08:00
caoyanyi ff46bca4cc * Adjust params type for mr control. 2024-05-08 15:16:19 +08:00
liugang 6e08ac4052 * mrControl: fix type error. 2024-05-07 16:36:28 +08:00
dingguodong 863af267b4 * Finish task#117277,117274. 2024-05-07 12:26:35 +08:00
dingguodong f4ed02b0ff + Return the response if the repoID is 0. 2024-05-06 16:36:57 +08:00
dingguodong 43cbfccc8f + Add the property for quick reference. 2024-05-06 15:31:28 +08:00
dingguodong 1a4f6c6d17 * Fix the unmatched parameter type. 2024-05-06 15:31:27 +08:00
caoyanyi acc26ba24d Merge remote-tracking branch 'remotes/origin/release-20.0'
# Conflicts:
#	db/update20.0.beta2.sql
#	lib/zin/func.php
#	lib/zin/wg/fileselector/v1.php
#	lib/zin/wg/upload/v1.php
#	module/action/model.php
#	module/backup/js/index.ui.js
#	module/block/lang/vi.php
#	module/block/ui/recentprojectblock.html.php
#	module/block/zen.php
#	module/common/lang/vi.php
#	module/custom/lang/vi.php
#	module/execution/js/kanban.ui.js
#	module/execution/ui/story.html.php
#	module/kanban/js/view.ui.js
#	module/metric/test/calc/project/hour/ac_of_weekly_all_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_weekly_in_waterfall.php
#	module/mr/control.php
#	module/mr/ui/browsebyexecution.html.php
#	module/product/zen.php
#	module/programplan/zen.php
#	module/project/model.php
#	module/repo/lang/de.php
#	module/repo/lang/en.php
#	module/repo/lang/fr.php
#	module/repo/lang/zh-cn.php
#	module/space/ui/createapplication.html.php
#	module/testcase/ui/view.html.php
#	module/upgrade/model.php
#	www/js/zui3/zen-editor/p-0aaccc7e.js
#	www/js/zui3/zen-editor/p-276dd30f.js
#	www/js/zui3/zen-editor/p-2b13cc9a.js
#	www/js/zui3/zen-editor/p-38d18c5d.js
#	www/js/zui3/zen-editor/p-3f6cad83.js
#	www/js/zui3/zen-editor/p-51e3a048.js
#	www/js/zui3/zen-editor/p-617d463f.js
#	www/js/zui3/zen-editor/p-62c0132e.js
#	www/js/zui3/zen-editor/p-6d22490c.js
#	www/js/zui3/zen-editor/p-a563f50b.js
#	www/js/zui3/zen-editor/p-bf31230c.js
#	www/js/zui3/zen-editor/p-c6c95773.js
#	www/js/zui3/zen-editor/p-d83dd3f0.js
#	www/js/zui3/zen-editor/p-d8bedd14.js
#	www/js/zui3/zen-editor/p-eaaa4129.js
#	www/js/zui3/zen-editor/zen-editor.esm.js
#	www/js/zui3/zui.zentao.css
#	www/js/zui3/zui.zentao.js
2024-05-06 09:17:49 +08:00
dingguodong a413f40cb0 + Add the method to sync MRs from API server. 2024-04-30 13:37:08 +08:00
dingguodong 08bcffcd59 * Fix typo. 2024-04-29 19:24:26 +08:00
caoyanyi 504e7b589b * Adjust data get sql for mr browse. 2024-04-29 13:52:10 +08:00
liyang f0250ea6c9 * Modify the mr display logic under the project. 2024-04-28 16:23:33 +08:00
dingguodong 33df01b904 * Record the log if the Merge Request synced by API server. 2024-04-28 15:35:24 +08:00
dingguodong 7cf0deefd7 * Show a message if the object not found or empty response. 2024-04-28 15:35:24 +08:00
liugang 1c13a31e99 * Rename $lang->colon to $lang->hyphen. 2024-04-28 14:35:26 +08:00
caoyanyi fbe51e9ae3 * Adjust mr sync rule. 2024-04-26 17:01:40 +08:00
dingguodong c9fd051bf3 * Use the author instead of committer. 2024-04-26 15:44:09 +08:00
dingguodong e163380c7c * Use the author instead of committer. 2024-04-26 15:25:12 +08:00
dingguodong 2a12833b3d + Short the commit id to 10. 2024-04-26 13:38:11 +08:00
dingguodong bb0362bcbc * Show unsupported feature tip for Gogs. 2024-04-23 17:33:03 +08:00
tianshujie bced2b76b4 Merge remote-tracking branch 'origin/release-20.0' 2024-04-23 17:12:24 +08:00
dingguodong 4351c0c0cc * Reindent and show commits for gitea/gogs. 2024-04-23 16:36:47 +08:00
dingguodong 22ca4dcdb7 * Compatible to Gitea/Gogs. Transform the project to int ID only for gitlab and gitfox. 2024-04-23 16:36:47 +08:00