Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		2020-03-08 19:38:53 +01:00
..
action_bar.js	Add confirmation modal when logging out from the web app (#11671)	2019-08-26 18:24:10 +02:00
autosuggest_account.js
character_counter.js
compose_form.js
emoji_picker_dropdown.js	Add announcements (#12662)	2020-01-23 22:00:13 +01: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-03-08 19:38:53 +01:00
privacy_dropdown.js	Change description of privacy levels to be more intuitive in web UI (#13197)	2020-03-08 15:59:55 +01:00
reply_indicator.js
search.js	Scroll into search bar when focus (#12032)	2019-10-01 19:19:10 +02:00
search_results.js
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
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