Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		2018-12-23 11:28:28 +01:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
accounts	Move hide_followers_count logic to an helper	2018-12-20 14:51:12 +01:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-23 11:28:28 +01:00
admin_mailer
application	Escape HTML in profile name preview in profile settings (#9446)	2018-12-07 16:42:22 +01:00
auth	Change the password form order (#9267)	2018-11-16 11:18:43 +01:00
authorize_interactions
directories	Move hide_followers_count logic to an helper	2018-12-20 14:51:12 +01:00
errors
filters	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
follower_accounts
following_accounts
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	Pagination improvements (#1445)	2017-04-11 01:11:41 +02:00
layouts	Restore oops.gif animation for user who have auto_play_gif set	2018-12-19 20:49:58 +01:00
media
notification_mailer
oauth
remote_follow
remote_interaction
remote_unfollows
settings	Add a per-user setting to hide followers count	2018-12-20 14:51:12 +01:00
shared	Fix form validation flash message color and input borders (#9235)	2018-11-08 21:06:14 +01:00
shares
stream_entries	Display a double reply arrow on public pages for toots that are replies	2018-11-30 22:09:52 +01:00
tags
user_mailer	Remove links to bridge.joinmastodon.org (non-functional) (#9608)	2018-12-22 23:32:00 +01:00
well_known