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.

Claire 1a853d7caa Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict caused because of minor code style change upstream, while glitch-soc has different code for handling variable maximum chars. Ported the change. - `app/serializers/initial_state_serializer.rb`: Conflict because glitch-soc had two extra attributes where upstream added one. Added upstream's attribute.		3 years ago
..
action_bar.js	Change "Direct" status visibility to "Only people I mention" in web UI (#18146)	3 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 'main' into glitch-soc/merge-upstream	3 years ago
emoji_picker_dropdown.js	Fix opening the emoji picker scrolling the single-column view to the top (#17579)	3 years ago
language_dropdown.js	Add language dropdown to compose in web UI (#18420)	3 years ago
navigation_bar.js	Change routing paths to use usernames in web UI (#16171)	3 years ago
poll_button.js	Add UI for creating polls (#10184)	6 years ago
poll_form.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
privacy_dropdown.js	Change “Only people I mention” to “Mentioned people only” (#18291)	3 years ago
reply_indicator.js	Change routing paths to use usernames in web UI (#16171)	3 years ago
search.js	Scroll into search bar when focus (#12032)	5 years ago
search_results.js	Change "Direct" status visibility to "Only people I mention" in web UI (#18146)	3 years ago
text_icon_button.js	Add language dropdown to compose in web UI (#18420)	3 years ago
upload.js	Add hint about missing media attachment description in web UI (#17845)	3 years ago
upload_button.js	Improve wording of the “Add media” button tooltip (#13954)	4 years ago
upload_form.js	Add OCR tool to media editing modal (#11566)	5 years ago
upload_progress.js	Add OCR tool to media editing modal (#11566)	5 years ago
warning.js	Add option to reduce motion (#5393)	7 years ago