Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		2019-05-26 15:41:40 +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
compose_form.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-10 17:09:12 +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	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00
reply_indicator.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00
search.js	Add responsive panels to the single-column layout (#10820)	2019-05-25 21:27:00 +02:00
search_results.js	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00
text_icon_button.js
upload.js	Improve image description user experience (#10036)	2019-02-14 01:04:43 +01: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
warning.js