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

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

2019-06-10 18:59:53 +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

Display full username in tooltip on search and autosuggest #7478 (#7920)

2018-07-01 04:16:13 +02:00

character_counter.js

Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)

2017-07-29 00:06:29 +02:00

compose_form.js

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

2019-06-10 18:59:53 +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

Add UI for creating polls (#10184)

2019-03-06 04:53:37 +01:00

poll_form.js

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

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

privacy_dropdown.js

Fix emoji-button appearing above privacy-dropdown (#11027)

2019-06-10 12:27:17 +02:00

reply_indicator.js

Upgrade Babel to version 7.0.0 (#5925)

2018-09-14 17:59:48 +02:00

search_results.js

Refactor icons in web UI to use Icon component (#9951)

2019-02-01 00:14:05 +01:00

search.js

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

2019-06-06 13:40:17 +02:00

text_icon_button.js

Use Class and Property Decorators (#3730)

2017-06-23 19:36:54 +02:00

upload_button.js

Add UI for creating polls (#10184)

2019-03-06 04:53:37 +01:00

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

Refactor icons in web UI to use Icon component (#9951)

2019-02-01 00:14:05 +01:00

upload.js

Improve image description user experience (#10036)

2019-02-14 01:04:43 +01:00

warning.js

Add option to reduce motion (#5393)

2017-10-16 09:36:15 +02:00