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

Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.

2019-10-03 11:10:12 +02: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

…

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

…

privacy_dropdown.js

Improve keyboard navigation in privacy dropdown (#11492)

2019-08-06 11:59:58 +02:00

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

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

upload.js

Add media editing modal (#11563)

2019-08-14 04:07:32 +02:00

warning.js

…