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.
mastodon/app/views
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
7 years ago
..
about Revert Font Awesome 5 upgrade (#8810) 8 years ago
accounts Refactor active_nav_class for use with multiple paths (#8757) 8 years ago
admin Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
admin_mailer Show remote reports in admin UI as coming from domain rather than user (#7347) 8 years ago
application Add separate setting for sidebar text (site_short_description) (#8107) 8 years ago
auth Redesign forms, verify link ownership with rel="me" (#8703) 8 years ago
authorize_interactions Add remote interaction dialog for toots (#8202) 8 years ago
errors
filters Redesign forms, verify link ownership with rel="me" (#8703) 8 years ago
follower_accounts Redesign public profiles and toots (#8068) 8 years ago
following_accounts Redesign public profiles and toots (#8068) 8 years ago
home Merge remote-tracking branch 'origin/master' into gs-master 8 years ago
invites Redesign forms, verify link ownership with rel="me" (#8703) 8 years ago
kaminari
layouts Revert Font Awesome 5 upgrade (#8810) 8 years ago
media Save video metadata and improve video OpenGraph tags (#6481) 8 years ago
notification_mailer Display content warning in mail notification emails (#6832) 8 years ago
oauth
remote_follow Redesign public profiles and toots (#8068) 8 years ago
remote_interaction Add remote interaction dialog for toots (#8202) 8 years ago
remote_unfollows Redesign public profiles and toots (#8068) 8 years ago
settings Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
shared Add separate setting for sidebar text (site_short_description) (#8107) 8 years ago
shares
stream_entries Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
tags Merge branch 'master' into glitch-soc/merge 8 years ago
user_mailer Fix e-mail changed notification (fixes #6778) (#6835) 8 years ago
well_known Add remote interaction dialog for toots (#8202) 8 years ago