mastodon/app/views
Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
2018-08-27 18:09:28 +02:00
..
about
accounts Better singulars of account followers/toots. (#8471) 2018-08-26 21:30:53 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2018-08-27 18:09:28 +02:00
admin_mailer Show remote reports in admin UI as coming from domain rather than user (#7347) 2018-05-04 13:26:25 +02:00
application
auth When registrations closed, link "Sign up" to joinmastodon.org (#8395) 2018-08-23 19:11:41 +02:00
authorize_interactions
errors New error page graphic. Other error page improvements (#5099) 2017-09-25 23:05:54 +02:00
filters Add option to not consider word boundaries when processing keyword filtering (#7975) 2018-07-09 02:22:09 +02:00
follower_accounts
following_accounts Redesign public profiles and toots (#8068) 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
kaminari Pagination improvements (#1445) 2017-04-11 01:11:41 +02:00
layouts Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
media
notification_mailer
oauth Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
remote_follow
remote_interaction
remote_unfollows Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-08-27 18:09:28 +02:00
shared Add separate setting for sidebar text (site_short_description) (#8107) 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-08-26 14:23:24 +02:00
tags
user_mailer Fix e-mail changed notification (fixes #6778) (#6835) 2018-03-19 20:07:47 +01:00
well_known Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00