1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-13 14:18:34 +09:00
YuruToot/app/javascript/mastodon/features/report
Eugen Rochko bf3cb42da7 Add server banner to web app, add GET /api/v2/instance to REST API (#19294)
Cherry-picked d2528b26b6

Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream changed stuff, we had extra attributes.
  Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
  Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
  so updated that file by keeping our extra attributes, and took upstream's
  version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
  Took upstream's version.
2022-10-09 19:51:39 +02:00
..
components Add privacy icons to report modal (#19190) 2022-09-21 22:46:57 +02:00
containers Change report modal to include category selection in web UI (#17565) 2022-02-23 20:03:46 +01:00
category.js Fix empty “Server rules violation” report option (#18165) 2022-04-28 21:29:29 +02:00
comment.js Fix report submit button not being disabled during submission in web UI (#17654) 2022-02-27 07:37:00 +01:00
rules.js Add server banner to web app, add GET /api/v2/instance to REST API (#19294) 2022-10-09 19:51:39 +02:00
statuses.js Fix report submit button not being disabled during submission in web UI (#17654) 2022-02-27 07:37:00 +01:00
thanks.js Change report modal to include category selection in web UI (#17565) 2022-02-23 20:03:46 +01:00