2023-07-31 18:13:42 -04:00
|
|
|
<div id="activity-feed" class="flex-list">
|
|
|
|
{{range .Feeds}}
|
|
|
|
<div class="flex-item">
|
|
|
|
<div class="flex-item-leading">
|
2023-08-09 23:19:39 -04:00
|
|
|
{{ctx.AvatarUtils.AvatarByAction .}}
|
2023-07-31 18:13:42 -04:00
|
|
|
</div>
|
2024-03-24 10:31:35 -04:00
|
|
|
<div class="flex-item-main tw-gap-2">
|
2023-07-31 18:13:42 -04:00
|
|
|
<div>
|
|
|
|
{{if gt .ActUser.ID 0}}
|
2024-03-02 10:30:18 -05:00
|
|
|
<a href="{{AppSubUrl}}/{{(.GetActUserName ctx) | PathEscape}}" title="{{.GetActDisplayNameTitle ctx}}">{{.GetActDisplayName ctx}}</a>
|
2023-07-31 18:13:42 -04:00
|
|
|
{{else}}
|
2023-09-29 08:12:54 -04:00
|
|
|
{{.ShortActUserName ctx}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{end}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{if .GetOpType.InActions "create_repo"}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.create_repo" (.GetRepoLink ctx) (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "rename_repo"}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.rename_repo" .GetContent (.GetRepoLink ctx) (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "commit_repo"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{if .Content}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.commit_repo" (.GetRepoLink ctx) (.GetRefLink ctx) .GetBranch (.ShortRepoPath ctx)}}
|
2019-03-27 18:22:39 -04:00
|
|
|
{{else}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.create_branch" (.GetRepoLink ctx) (.GetRefLink ctx) .GetBranch (.ShortRepoPath ctx)}}
|
2015-12-07 17:30:52 -05:00
|
|
|
{{end}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "create_issue"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.create_issue" (printf "%s/issues/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "create_pull_request"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.create_pull_request" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "transfer_repo"}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.transfer_repo" .GetContent (.GetRepoLink ctx) (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "push_tag"}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.push_tag" (.GetRepoLink ctx) (.GetRefLink ctx) .GetTag (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "comment_issue"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.comment_issue" (printf "%s/issues/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "merge_pull_request"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.merge_pull_request" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2024-12-10 13:10:16 -05:00
|
|
|
{{else if .GetOpType.InActions "auto_merge_pull_request"}}
|
|
|
|
{{$index := index .GetIssueInfos 0}}
|
|
|
|
{{ctx.Locale.Tr "action.auto_merge_pull_request" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "close_issue"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.close_issue" (printf "%s/issues/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "reopen_issue"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.reopen_issue" (printf "%s/issues/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "close_pull_request"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.close_pull_request" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "reopen_pull_request"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.reopen_pull_request" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "delete_tag"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.delete_tag" (.GetRepoLink ctx) .GetTag (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "delete_branch"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.delete_branch" (.GetRepoLink ctx) .GetBranch (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "mirror_sync_push"}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.mirror_sync_push" (.GetRepoLink ctx) (.GetRefLink ctx) .GetBranch (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "mirror_sync_create"}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.mirror_sync_create" (.GetRepoLink ctx) (.GetRefLink ctx) .GetBranch (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "mirror_sync_delete"}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.mirror_sync_delete" (.GetRepoLink ctx) .GetBranch (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "approve_pull_request"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.approve_pull_request" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "reject_pull_request"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.reject_pull_request" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "comment_pull"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.comment_pull" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "publish_release"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$linkText := .Content | RenderEmoji $.Context}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.publish_release" (.GetRepoLink ctx) (printf "%s/releases/tag/%s" (.GetRepoLink ctx) .GetTag) (.ShortRepoPath ctx) $linkText}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "review_dismissed"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$index := index .GetIssueInfos 0}}
|
|
|
|
{{$reviewer := index .GetIssueInfos 1}}
|
2024-02-25 09:02:20 -05:00
|
|
|
{{ctx.Locale.Tr "action.review_dismissed" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx) $reviewer}}
|
2015-12-07 17:30:52 -05:00
|
|
|
{{end}}
|
2024-11-04 06:30:00 -05:00
|
|
|
{{DateUtils.TimeSince .GetCreate}}
|
2015-12-07 17:30:52 -05:00
|
|
|
</div>
|
2023-09-07 10:23:13 -04:00
|
|
|
{{if .GetOpType.InActions "commit_repo" "mirror_sync_push"}}
|
2023-08-23 00:23:30 -04:00
|
|
|
{{$push := ActionContent2Commits .}}
|
2023-09-29 08:12:54 -04:00
|
|
|
{{$repoLink := (.GetRepoLink ctx)}}
|
2023-10-11 10:02:15 -04:00
|
|
|
{{$repo := .Repo}}
|
2024-03-24 10:31:35 -04:00
|
|
|
<div class="tw-flex tw-flex-col tw-gap-1">
|
2023-09-30 11:48:34 -04:00
|
|
|
{{range $push.Commits}}
|
|
|
|
{{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
|
|
|
|
<div class="flex-text-block">
|
|
|
|
<img class="ui avatar" src="{{$push.AvatarLink $.Context .AuthorEmail}}" title="{{.AuthorName}}" width="16" height="16">
|
|
|
|
<a class="ui sha label" href="{{$commitLink}}">{{ShortSha .Sha1}}</a>
|
|
|
|
<span class="text truncate">
|
2024-01-15 03:49:24 -05:00
|
|
|
{{RenderCommitMessage $.Context .Message ($repo.ComposeMetas ctx)}}
|
2023-09-30 11:48:34 -04:00
|
|
|
</span>
|
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
</div>
|
2023-08-23 00:23:30 -04:00
|
|
|
{{if and (gt $push.Len 1) $push.CompareURL}}
|
2023-09-25 04:56:50 -04:00
|
|
|
<a href="{{AppSubUrl}}/{{$push.CompareURL}}">{{ctx.Locale.Tr "action.compare_commits" $push.Len}} »</a>
|
2023-08-23 00:23:30 -04:00
|
|
|
{{end}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "create_issue"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
<span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji $.Context | RenderCodeBlock}}</span>
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "create_pull_request"}}
|
2023-07-31 18:13:42 -04:00
|
|
|
<span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji $.Context | RenderCodeBlock}}</span>
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "comment_issue" "approve_pull_request" "reject_pull_request" "comment_pull"}}
|
2023-09-29 08:12:54 -04:00
|
|
|
<a href="{{.GetCommentLink ctx}}" class="text truncate issue title">{{(.GetIssueTitle ctx) | RenderEmoji $.Context | RenderCodeBlock}}</a>
|
2023-07-31 18:13:42 -04:00
|
|
|
{{$comment := index .GetIssueInfos 1}}
|
2023-12-04 16:48:42 -05:00
|
|
|
{{if $comment}}
|
2024-03-23 17:22:15 -04:00
|
|
|
<div class="markup tw-text-14">{{RenderMarkdownToHtml ctx $comment}}</div>
|
2023-07-31 18:13:42 -04:00
|
|
|
{{end}}
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "merge_pull_request"}}
|
2023-10-07 19:26:27 -04:00
|
|
|
<div class="flex-item-body text black">{{index .GetIssueInfos 1}}</div>
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "close_issue" "reopen_issue" "close_pull_request" "reopen_pull_request"}}
|
2023-09-29 08:12:54 -04:00
|
|
|
<span class="text truncate issue title">{{(.GetIssueTitle ctx) | RenderEmoji $.Context | RenderCodeBlock}}</span>
|
2023-09-07 10:23:13 -04:00
|
|
|
{{else if .GetOpType.InActions "pull_review_dismissed"}}
|
2023-10-07 19:26:27 -04:00
|
|
|
<div class="flex-item-body text black">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</div>
|
|
|
|
<div class="flex-item-body text black">{{index .GetIssueInfos 2 | RenderEmoji $.Context}}</div>
|
2023-07-31 18:13:42 -04:00
|
|
|
{{end}}
|
2015-12-07 17:30:52 -05:00
|
|
|
</div>
|
2023-07-31 18:13:42 -04:00
|
|
|
<div class="flex-item-trailing">
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 12:42:49 -04:00
|
|
|
{{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32 "text grey tw-mr-1"}}
|
2015-12-07 17:30:52 -05:00
|
|
|
</div>
|
|
|
|
</div>
|
2023-07-31 18:13:42 -04:00
|
|
|
{{end}}
|
|
|
|
{{template "base/paginate" .}}
|
|
|
|
</div>
|