mastodon/app/views
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
..
about Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
accounts Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
admin Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +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 Added haml-lint and fix warnings () 2017-05-08 03:35:25 +02:00
auth Add contact e-mail hint to 2FA login form () 2018-05-06 10:52:36 +02:00
authorize_follows Enable custom emojis in profiles (notes, field values, display names) () 2018-05-06 11:48:51 +02:00
errors New error page graphic. Other error page improvements () 2017-09-25 23:05:54 +02:00
follower_accounts Add missing meta description to profiles, some other SEO stuff () 2018-03-09 00:35:07 +01:00
following_accounts Add missing meta description to profiles, some other SEO stuff () 2018-03-09 00:35:07 +01:00
home Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
invites Able to deactivate invites if they aren't expired () 2018-04-17 13:52:08 +02:00
kaminari Pagination improvements () 2017-04-11 01:11:41 +02:00
layouts Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-11 09:17:21 +00: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 Fix remote follow () 2017-04-28 00:16:44 +02:00
remote_unfollows Enable custom emojis in profiles (notes, field values, display names) () 2018-05-06 11:48:51 +02:00
settings Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
shared Enable custom emojis in profiles (notes, field values, display names) () 2018-05-06 11:48:51 +02:00
shares Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
stream_entries Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
tags Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
user_mailer Fix e-mail changed notification (fixes ) () 2018-03-19 20:07:47 +01:00
well_known Serialize webfinger XML with Ox instead of Nokogiri () 2018-05-02 22:28:46 +02:00