mastodon/app/views
Claire c79a03b319 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.
2022-03-15 20:45:27 +01:00
..
about Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +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-15 20:45: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
directories Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
disputes/strikes Change how changes to media attachments are stored for edits (#17696) 2022-03-09 09:06:17 +01:00
errors
filters Fix not being able to change world filter expiration back to “Never” (#15858) 2021-03-12 05:25:50 +01:00
follower_accounts Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
following_accounts Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
home Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
invites
kaminari
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 Change how changes to media attachments are stored for edits (#17696) 2022-03-09 09:06:17 +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
remote_interaction
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +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-03-15 20:45:27 +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 Change text version of warning mail to mention appeals instead of mails (#17725) 2022-03-09 12:11:11 +01:00
well_known/host_meta Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00