imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		2018-02-23 23:28:31 +09:00
..
actions	Focal points (#6520)	2018-02-22 00:35:46 +01:00
components	Focal points (#6520)	2018-02-22 00:35:46 +01:00
containers	Add option to show only local toots in timeline preview (#6292)	2018-02-04 06:00:10 +01:00
features	Focal points (#6520)	2018-02-22 00:35:46 +01:00
locales	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-02-17 00:02:37 -06:00
middleware	Audio.prototype.seek is undefined (#5935)	2017-12-09 01:25:00 +01:00
reducers	Focal points (#6520)	2018-02-22 00:35:46 +01:00
selectors	Profile redirect notes (#5746)	2017-11-18 19:39:02 +01:00
service_worker	Restore vanilla components	2017-11-17 19:29:16 -08:00
store	Restore vanilla components	2017-11-17 19:29:16 -08:00
.gitkeep	Replace sprockets/browserify with Webpack (#2617)	2017-05-03 02:04:16 +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	Restore vanilla components	2017-11-17 19:29:16 -08:00
extra_polyfills.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
initial_state.js	Add preference to always display sensitive media (#6448)	2018-02-09 00:26:57 +01:00
is_mobile.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
link_header.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
load_polyfills.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
main.js	bug fix (WebPush does not work) (#6120)	2017-12-28 16:20:34 +01:00
performance.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
ready.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
rtl.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
scroll.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
settings.js	Move push notifications settings (regression from #5879) (#5941)	2017-12-09 14:18:45 +01:00
stream.js	Use streaming API for standalone timelines on /about and /tag pages (#5998)	2017-12-13 02:12:41 +01:00
test_setup.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
uuid.js	Restore vanilla components	2017-11-17 19:29:16 -08:00