Thibaut Girka 37e746eab6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		2020-08-30 16:13:08 +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
emoji_picker_dropdown.js	Fix crash when failing to load emoji picker (#14525)	2020-08-08 17:57:56 +02:00
navigation_bar.js	Add confirmation modal when logging out from the web app (#11671)	2019-08-26 18:24:10 +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 scrolling issues when closing some dropdown menus (#14606)	2020-08-21 14:14:28 +02:00
reply_indicator.js
search.js	Scroll into search bar when focus (#12032)	2019-10-01 19:19:10 +02:00
search_results.js	Add search results pagination to web UI (#11409)	2019-07-27 05:49:50 +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 media editing modal (#11563)	2019-08-14 04:07:32 +02: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