Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		2018-12-18 16:55:15 +01:00
..
actions	Add new first-time tutorial (#9531)	2018-12-17 11:07:17 +01:00
components	Back to the getting-started when pins the timeline. (#9561)	2018-12-18 16:43:50 +01:00
containers	Add new first-time tutorial (#9531)	2018-12-17 11:07:17 +01:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
middleware
reducers	Split out is_changing_upload from is_submitting (#9536)	2018-12-16 21:17:56 +01: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
base_polyfills.js
common.js	Revert Font Awesome 5 upgrade (#8810)	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-22 17:51:38 +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