Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		2018-10-01 12:43:20 +02:00
..
actions	Add user preference to always expand toots marked with content warnings (#8762)	2018-09-24 05:44:01 +02:00
components	Double the threshold for "read more" functionality (#8835)	2018-10-01 03:38:10 +02:00
containers	Only focus first element of dropdown menus if using keyboard (#8679)	2018-09-13 20:31:33 +02:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
middleware	Add missing rejection handling for Promises (#7008)	2018-04-02 14:51:02 +02:00
reducers	Only focus first element of dropdown menus if using keyboard (#8679)	2018-09-13 20:31:33 +02:00
selectors	Don't filter own toots (fixes #8289) (#8298)	2018-08-19 18:44:18 +02:00
service_worker	Fix a problem about generating an url of notifications (#8758)	2018-09-24 05:45:58 +02:00
storage	Cache media only when storage can be freed (#7547)	2018-05-19 19:22:11 +02:00
store	…
utils	Resize images by area instead of fixed dimensions (#8083)	2018-07-28 03:33:00 +02:00
api.js	Refactor /api/web APIs to use the centralized axios instance (#6223)	2018-01-08 20:01:33 +01:00
base_polyfills.js	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
common.js	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
compare_id.js	Fix comparing id (#7180)	2018-04-18 16:50:19 +02:00
extra_polyfills.js	…
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
is_mobile.js	…
link_header.js	…
load_polyfills.js	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	Implement tag auto-completion by history (#6621)	2018-03-04 20:27:25 +01:00
stream.js	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	2018-05-18 02:32:35 +02:00
test_setup.js	…
uuid.js	…