David Yip 7174d1c955

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/javascript/images/mastodon-drawer.png
	app/javascript/styles/mastodon/components.scss

2017-12-26 22:24:19 -06:00

..

actions

Refactor web_push_subscription (#6047)

2017-12-24 04:47:35 +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

Move the mastodon on Getting Started column to drawer column (#6109)

2017-12-27 03:31:30 +01:00

locales

Update and add some translate

2017-12-22 12:22:41 +09: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

Refactor web_push_subscription (#6047)

2017-12-24 04:47:35 +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