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

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

action_bar.js

…

autosuggest_account.js

…

character_counter.js

…

compose_form.js

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-04 16:37:26 +02:00

emoji_picker_dropdown.js

Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)

2019-03-30 01:41:35 +01:00

navigation_bar.js

…

poll_button.js

…

poll_form.js

Allow switching between singe-option and multiple-option polls (#10603)

2019-04-22 14:56:14 +02:00

privacy_dropdown.js

…

reply_indicator.js

…

search_results.js

…

search.js

Minor code cleanup (#10613)

2019-04-22 14:55:24 +02:00

text_icon_button.js

…

upload_button.js

…

upload_form.js

Make the "mark media as sensitive" button more obvious in web UI (#10673)

2019-05-03 04:34:55 +02:00

upload_progress.js

…

upload.js

…

warning.js

…