David Yip 54148b9a4a Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss		2018-01-02 00:11:41 -06:00
..
actions	bug fix (WebPush does not work) (#6120)	2017-12-28 16:20:34 +01:00
components	Add validation for onMuteNotifications (#6092)	2017-12-24 17:18:45 +09:00
containers	Restore vanilla components	2017-11-17 19:29:16 -08:00
features	Use const instead of let for constant (#6106)	2018-01-02 13:28:49 +09:00
locales	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-31 09:17:15 +00:00
middleware	Audio.prototype.seek is undefined (#5935)	2017-12-09 01:25:00 +01:00
reducers	Refactor web_push_subscription (#6047)	2017-12-24 04:47:35 +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	Restore vanilla components	2017-11-17 19:29:16 -08: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	Restore vanilla components	2017-11-17 19:29:16 -08: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