Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
This commit is contained in:
Claire
2023-01-05 14:16:25 +01:00
47 changed files with 357 additions and 327 deletions

View File

@@ -4,8 +4,8 @@
.report-notes__item__header
%span.username
= link_to report_note.account.username, admin_account_path(report_note.account_id)
%time.relative-formatted{ datetime: report_note.created_at }
= t('admin.report_notes.created_at')
%time.relative-formatted{ datetime: report_note.created_at.iso8601 }
= l report_note.created_at.to_date
.report-notes__item__content
= simple_format(h(report_note.content))

View File

@@ -141,7 +141,7 @@
- else
= link_to @report.account.domain, admin_instance_path(@report.account.domain)
%time.relative-formatted{ datetime: @report.created_at.iso8601 }
= t('admin.report_notes.created_at')
= l @report.created_at.to_date
.report-notes__item__content
= simple_format(h(@report.comment))