mastodon/app/views
Claire 8743b1ea40 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
2022-03-02 20:48:27 +01:00
..
about Change CAPTCHA handling to be only on email verification 2022-01-25 23:56:57 +01:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 20:48:27 +01:00
admin_mailer Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
application Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
authorize_interactions Fix misleading error when attempting to re-send a pending follow request (#13133) 2020-02-24 21:19:19 +01:00
directories Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
disputes/strikes Change old moderation strikes to be displayed in a separate page (#17566) 2022-03-01 19:37:47 +01:00
errors Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
filters Fix not being able to change world filter expiration back to “Never” (#15858) 2021-03-12 05:25:50 +01:00
follower_accounts Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
following_accounts Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
home Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
invites Remove invite comments from UI (#12068) 2019-10-03 22:37:13 +02:00
kaminari Pagination improvements (#1445) 2017-04-11 01:11:41 +02:00
layouts Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
media Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
notification_mailer Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
oauth Change visual separation of applications in authorized apps list (#17686) 2022-03-02 20:28:25 +01:00
public_timelines Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
relationships Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
remote_follow Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
remote_interaction Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
settings Disable notifications for trending links and trending statuses by default 2022-02-26 10:46:26 +01:00
shared Add honeypot fields and minimum fill-out time for sign-up form (#15276) 2020-12-10 06:27:26 +01:00
shares Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
statuses_cleanup Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
user_mailer Add appeals (#17364) 2022-02-14 21:27:53 +01:00
well_known/host_meta Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00