David Yip a6fb1c58ee

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

Conflicts:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb

2018-02-04 16:36:19 -06:00

..

actions

Fix initial_state me in push_notification_register (#6349)

2018-01-24 14:37:46 +01:00

components

fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417)

2018-02-03 18:41:51 +01:00

containers

Add option to show only local toots in timeline preview (#6292)

2018-02-04 06:00:10 +01:00

features

Add option to show only local toots in timeline preview (#6292)

2018-02-04 06:00:10 +01:00

locales

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

2018-02-04 16:36:19 -06:00

middleware

Audio.prototype.seek is undefined (#5935)

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

reducers

fix filter search index being too strict when looking for line breaks (#6318)

2018-01-21 13:23:17 +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