Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02:00
..
action_bar.js	Change "Direct" status visibility to "Only people I mention" in web UI (#18146)	2022-04-29 00:24:31 +02:00
autosuggest_account.js	…
character_counter.js	…
compose_form.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
emoji_picker_dropdown.js	Fix opening the emoji picker scrolling the single-column view to the top (#17579)	2022-02-16 21:44:47 +01:00
navigation_bar.js	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
poll_button.js	…
poll_form.js	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
privacy_dropdown.js	Change "Direct" status visibility to "Only people I mention" in web UI (#18146)	2022-04-29 00:24:31 +02:00
reply_indicator.js	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
search.js	Scroll into search bar when focus (#12032)	2019-10-01 19:19:10 +02:00
search_results.js	Change "Direct" status visibility to "Only people I mention" in web UI (#18146)	2022-04-29 00:24:31 +02:00
text_icon_button.js	Change icon button styles to make hover/focus states more obvious (#11474)	2019-08-03 19:10:50 +02:00
upload.js	Add hint about missing media attachment description in web UI (#17845)	2022-03-22 09:48:12 +01:00
upload_button.js	Improve wording of the “Add media” button tooltip (#13954)	2020-06-26 00:14:29 +02:00
upload_form.js	Add OCR tool to media editing modal (#11566)	2019-08-15 15:13:26 +02:00
upload_progress.js	Add OCR tool to media editing modal (#11566)	2019-08-15 15:13:26 +02:00
warning.js	…