Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.		2018-10-30 17:52:08 +01:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
accounts	Add description meta tag additionally to og:description (#8941)	2018-10-10 02:21:30 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +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	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
auth	Fix td instead of th in sessions table header (#9162)	2018-10-30 17:00:34 +01:00
authorize_interactions	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
errors
filters	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
follower_accounts	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
following_accounts	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
home	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-07 19:47:56 +02:00
invites	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
kaminari
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
media	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
notification_mailer	Display content warning in mail notification emails (#6832)	2018-03-19 20:12:20 +01:00
oauth
remote_follow	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
remote_interaction	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
remote_unfollows	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
settings	move some constants to rails environment	2018-10-29 21:29:31 +01:00
shared	Add description meta tag additionally to og:description (#8941)	2018-10-10 02:21:30 +02:00
shares
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +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 #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