mastodon/app/views
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
2022-11-14 08:35:55 +01:00
..
about Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
accounts Fix being able to spoof link verification (#20217) 2022-11-09 08:24:21 +01:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
admin_mailer Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
application Add image processing and generate blurhash for server thumbnail (#19348) 2022-10-13 11:29:19 +02:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-11-08 15:44:57 +01:00
authorize_interactions Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
custom_css Fix badge color not affected (#18826) 2022-07-19 01:06:11 +02:00
disputes/strikes Add null check on application in dispute viewer (#19851) 2022-11-07 03:40:17 +01:00
errors
filters Fix error when accessing /filters/:id/statuses on glitch-soc (#1837) 2022-08-31 11:55:27 +02:00
follower_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
following_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
home Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
invites
kaminari
layouts Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
media
notification_mailer Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
oauth Change visual separation of applications in authorized apps list (#17686) 2022-03-02 20:28:25 +01:00
privacy Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
relationships
settings Add “Glitch-only” label to glitch-specific settings 2022-11-12 11:30:35 +01:00
shared Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
shares
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-11-07 19:53:30 +01:00
statuses_cleanup
tags Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
user_mailer Remove unnecessary sections from welcome e-mail (#19299) 2022-10-06 00:03:52 +02:00
well_known/host_meta