David Yip 071c2c9c85

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

Conflicts:
	app/javascript/styles/mastodon/components.scss

2018-01-20 10:45:43 -06:00

..

actions

Restore onboarding modal (#6303)

2018-01-20 01:32:37 +01:00

components

Fix home regeneration (#6251)

2018-01-17 23:56:03 +01:00

containers

Restore onboarding modal (#6303)

2018-01-20 01:32:37 +01:00

features

Restore onboarding modal (#6303)

2018-01-20 01:32:37 +01:00

locales

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

2018-01-20 10:45:43 -06:00

middleware

Audio.prototype.seek is undefined (#5935)

2017-12-09 01:25:00 +01:00

reducers

Do not throw away statuses obtained via websocket when API request finishes (#6302)

2018-01-19 21:48:00 +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

Enable ESLint rules import/* (#5414)

2017-10-16 11:12:09 +02: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

Improve eslint rules (#3147)

2017-05-20 17:31:47 +02: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

Upgrade to React 16 (#5119)

2017-09-30 04:29:56 +02:00

ready.js

Restore vanilla components

2017-11-17 19:29:16 -08:00

rtl.js

Improve RTL detection (#3682)

2017-06-10 15:06:50 +02: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