You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	Make avatar and headers respect `auto_play_gif` (#9515)	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	…
application	Escape HTML in profile name preview in profile settings (#9446)	6 years ago
auth	Change the password form order (#9267)	6 years ago
authorize_interactions	…
directories	Remove "most popular" tab from profile directory, add responsive design (#9539)	6 years ago
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	…
notification_mailer	…
oauth	…
remote_follow	…
remote_interaction	…
remote_unfollows	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	Fix form validation flash message color and input borders (#9235)	6 years ago
shares	…
stream_entries	Display a double reply arrow on public pages for toots that are replies	6 years ago
tags	…
user_mailer	…
well_known	…