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 6f85bb754b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc		6 years ago
..
action_bar.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
autosuggest_account.js	Display full username in tooltip on search and autosuggest #7478 (#7920)	6 years ago
character_counter.js	Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)	7 years ago
compose_form.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
emoji_picker_dropdown.js	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)	6 years ago
navigation_bar.js	Fix "Invalid DOM property `class`" (#7798)	7 years ago
poll_button.js	Add UI for creating polls (#10184)	6 years ago
poll_form.js	Allow switching between singe-option and multiple-option polls (#10603)	6 years ago
privacy_dropdown.js	Refactor icons in web UI to use Icon component (#9951)	6 years ago
reply_indicator.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
search.js	Minor code cleanup (#10613)	6 years ago
search_results.js	Refactor icons in web UI to use Icon component (#9951)	6 years ago
text_icon_button.js	Use Class and Property Decorators (#3730)	8 years ago
upload.js	Improve image description user experience (#10036)	6 years ago
upload_button.js	Add UI for creating polls (#10184)	6 years ago
upload_form.js	Add ability to specify alternative text for media attachments (#5123)	7 years ago
upload_progress.js	Refactor icons in web UI to use Icon component (#9951)	6 years ago
warning.js	Add option to reduce motion (#5393)	7 years ago