Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		2018-12-18 16:55:15 +01:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
accounts	Make avatar and headers respect auto_play_gif (#9515)	2018-12-14 20:34:18 +01:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01: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	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	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
directories	Remove "most popular" tab from profile directory, add responsive design (#9539)	2018-12-17 03:14:28 +01: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-12-18 16:55:15 +01:00
media
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	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +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	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