1
0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 15:15:08 +01:00
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.
2018-10-05 15:23:57 +02:00
..
about Revert Font Awesome 5 upgrade () 2018-09-28 02:11:14 +02:00
accounts Refactor active_nav_class for use with multiple paths () 2018-09-23 20:42:13 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
admin_mailer Show remote reports in admin UI as coming from domain rather than user () 2018-05-04 13:26:25 +02:00
application Add separate setting for sidebar text (site_short_description) () 2018-07-31 18:59:34 +02:00
auth Redesign forms, verify link ownership with rel="me" () 2018-09-18 16:45:58 +02:00
authorize_interactions Add remote interaction dialog for toots () 2018-08-18 03:03:12 +02:00
errors New error page graphic. Other error page improvements () 2017-09-25 23:05:54 +02:00
filters Redesign forms, verify link ownership with rel="me" () 2018-09-18 16:45:58 +02:00
follower_accounts Redesign public profiles and toots () 2018-07-28 19:25:33 +02:00
following_accounts Redesign public profiles and toots () 2018-07-28 19:25:33 +02:00
home Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
invites Redesign forms, verify link ownership with rel="me" () 2018-09-18 16:45:58 +02:00
kaminari Pagination improvements () 2017-04-11 01:11:41 +02:00
layouts Revert Font Awesome 5 upgrade () 2018-09-28 02:11:14 +02:00
media Save video metadata and improve video OpenGraph tags () 2018-02-16 07:22:20 +01:00
notification_mailer Display content warning in mail notification emails () 2018-03-19 20:12:20 +01:00
oauth Oauth code in input form and add description message () 2017-09-17 15:23:44 +02:00
remote_follow Redesign public profiles and toots () 2018-07-28 19:25:33 +02:00
remote_interaction Add remote interaction dialog for toots () 2018-08-18 03:03:12 +02:00
remote_unfollows Redesign public profiles and toots () 2018-07-28 19:25:33 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
shared Add separate setting for sidebar text (site_short_description) () 2018-07-31 18:59:34 +02:00
shares Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
stream_entries Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
tags Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
user_mailer Fix e-mail changed notification (fixes ) () 2018-03-19 20:07:47 +01:00
well_known Add remote interaction dialog for toots () 2018-08-18 03:03:12 +02:00