Claire 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.		2021-10-14 21:44:57 +02:00
..
action_bar.js	Add link to bookmarks in web UI dropdown (#13273)	2020-03-21 03:14:28 +01:00
autosuggest_account.js	…
character_counter.js	…
compose_form.js	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +01:00
emoji_picker_dropdown.js	Add assets from Twemoji 13.1.0 (#16345)	2021-06-01 14:35:49 +02: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	fix typo (#15705)	2021-02-11 06:22:11 +01: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	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
text_icon_button.js	…
upload.js	…
upload_button.js	Improve wording of the “Add media” button tooltip (#13954)	2020-06-26 00:14:29 +02:00
upload_form.js	…
upload_progress.js	…
warning.js	…