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

Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb

2019-06-07 17:00:36 +02:00

..

action_bar.js

Add responsive panels to the single-column layout (#10820)

2019-05-25 21:27:00 +02:00

autosuggest_account.js

…

character_counter.js

…

compose_form.js

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

2019-06-07 17:00:36 +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

Add responsive panels to the single-column layout (#10820)

2019-05-25 21:27:00 +02:00

poll_button.js

…

poll_form.js

Add emoji suggestions to CW and poll option fields (#10555)

2019-05-09 22:10:27 +02:00

privacy_dropdown.js

…

reply_indicator.js

…

search_results.js

…

search.js

Fix overlap of emoji button on search popup (#10978)

2019-06-06 13:40:17 +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

…