David Yip 89a9d629f7

Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
	Gemfile.lock

2018-01-15 22:17:48 -06:00

..

actions

Refactor /api/web APIs to use the centralized axios instance (#6223)

2018-01-08 20:01:33 +01:00

components

Surround mid-text display names with bdi tags (#6257)

2018-01-15 18:55:10 +01:00

containers

Restore vanilla components

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

features

Surround mid-text display names with bdi tags (#6257)

2018-01-15 18:55:10 +01:00

locales

i18n: Update Polish translation

2018-01-12 23:08:51 +01:00

middleware

Audio.prototype.seek is undefined (#5935)

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

reducers

Rename key to path in actions and reducers for settings (#6105)

2018-01-02 13:50:54 +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

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