Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +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/master

2019-12-19 13:52:54 +01:00

privacy_dropdown.js

…

reply_indicator.js

…

search_results.js

…

search.js

Scroll into search bar when focus (#12032)

2019-10-01 19:19:10 +02:00

text_icon_button.js

…

upload_button.js

…

upload_form.js

…

upload_progress.js

…

upload.js

…

warning.js

…