diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-11 21:41:23 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-11 21:41:23 +0200 |
| commit | cdf20f4367226bc5682a0b040fa62f56d6f58fb5 (patch) | |
| tree | 630fca746dc138284eb7402c878f212578ebd74c /app/views/admin/reports | |
| parent | f040b9aee3f84cb3ba8926fed81d47df3f1094a7 (diff) | |
| parent | a2ce7508c95f473a77d46a99fc1e090c0defadcc (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/serializers/rest/instance_serializer.rb`: Upstream changed the fields returned by /api/v1/instance by adding a `configuration` field holding a lot of useful information making our `max_toot_chars` and `poll_limits` fields obsolete. Keeping those around for now for compatibility. - `app/validators/status_length_validator.rb`: No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to MAX_CHARS which is defined differently in glitch-soc. Ported upstream changes.
Diffstat (limited to 'app/views/admin/reports')
| -rw-r--r-- | app/views/admin/reports/index.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index 721c55f71..619173373 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -7,6 +7,12 @@ %ul %li= filter_link_to t('admin.reports.unresolved'), resolved: nil %li= filter_link_to t('admin.reports.resolved'), resolved: '1' + .filter-subset + %strong= t('admin.reports.target_origin') + %ul + %li= filter_link_to t('admin.accounts.location.all'), target_origin: nil + %li= filter_link_to t('admin.accounts.location.local'), target_origin: 'local' + %li= filter_link_to t('admin.accounts.location.remote'), target_origin: 'remote' = form_tag admin_reports_url, method: 'GET', class: 'simple_form' do .fields-group |