You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/views
Jeremy Kescher 03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	lib/mastodon/version.rb
#	public/avatars/original/missing.png
2 years ago
..
about Change public accounts pages to mount the web UI (#19319) 2 years ago
accounts Merge remote-tracking branch 'upstream/main' into develop 2 years ago
admin Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
admin_mailer Add support for language preferences for trending statuses and links (#18288) 2 years ago
application Add image processing and generate blurhash for server thumbnail (#19348) 2 years ago
auth Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
authorize_interactions Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2 years ago
custom_css Fix badge color not affected (#18826) 2 years ago
disputes/strikes change null check in dispute viewer to be unless 2 years ago
errors Add specific rate limits for posting and following (#13172) 4 years ago
filters Fix error when accessing /filters/:id/statuses on glitch-soc (#1837) 2 years ago
follower_accounts Change public accounts pages to mount the web UI (#19319) 2 years ago
following_accounts Change public accounts pages to mount the web UI (#19319) 2 years ago
home Change public accounts pages to mount the web UI (#19319) 2 years ago
invites Remove invite comments from UI (#12068) 5 years ago
kaminari Pagination improvements (#1445) 7 years ago
layouts Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
media Merge branch 'main' into glitch-soc/merge-upstream 3 years ago
notification_mailer Remove digest e-mails (#17985) 2 years ago
oauth Change visual separation of applications in authorized apps list (#17686) 2 years ago
privacy Change public accounts pages to mount the web UI (#19319) 2 years ago
relationships Merge branch 'main' into glitch-soc/merge-upstream 3 years ago
settings Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
shared Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
shares Add subresource integrity for JS and CSS assets (#15096) 4 years ago
statuses Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
statuses_cleanup Add feature to automatically delete old toots (#16529) 3 years ago
tags Merge remote-tracking branch 'upstream/main' into develop 2 years ago
user_mailer Remove unnecessary sections from welcome e-mail (#19299) 2 years ago
well_known/host_meta Remove dependency on goldfinger gem (#14919) 4 years ago