mastodon/app/views
Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
2022-05-11 09:37:48 +02: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 2022-05-11 09:37:48 +02:00
admin Fix incorrect upload size limit at /admin/custom_emojis/new in glitch-soc (#1763) 2022-05-05 19:11:56 +02:00
admin_mailer Fix incorrect link in "new trending tags" email (#18156) 2022-04-28 17:15:29 +02:00
application Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
authorize_interactions Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
directories Merge branch 'main' into glitch-soc/merge-upstream 2022-03-28 16:22:28 +02:00
disputes/strikes Fix ambiguous wording on appeal actions (#18328) 2022-05-06 21:41:34 +02:00
errors
filters
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
invites
kaminari
layouts Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
media
notification_mailer Refactor account and status formatting (#17877) 2022-03-28 01:17:17 +02:00
oauth Change visual separation of applications in authorized apps list (#17686) 2022-03-02 20:28:25 +01:00
public_timelines
relationships
remote_follow
remote_interaction
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 19:53:32 +02:00
shared
shares
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-05-08 21:00:49 +02:00
statuses_cleanup
tags Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
user_mailer Remove sign-in token authentication, instead send e-mail about new sign-in (#17970) 2022-04-06 20:58:12 +02:00
well_known/host_meta