masto-fe-standalone/app/javascript/mastodon
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 () 2018-09-24 05:44:01 +02:00
components Double the threshold for "read more" functionality () 2018-10-01 03:38:10 +02:00
containers Only focus first element of dropdown menus if using keyboard () 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
reducers Only focus first element of dropdown menus if using keyboard () 2018-09-13 20:31:33 +02:00
selectors Don't filter own toots (fixes ) () 2018-08-19 18:44:18 +02:00
service_worker Fix a problem about generating an url of notifications () 2018-09-24 05:45:58 +02:00
storage
store
utils Resize images by area instead of fixed dimensions () 2018-07-28 03:33:00 +02:00
api.js
base_polyfills.js
common.js Revert Font Awesome 5 upgrade () 2018-09-28 02:11:14 +02:00
compare_id.js
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
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js