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

…

reducers

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

2018-01-21 13:23:17 +01:00

selectors

…

service_worker

…

store

…

.gitkeep

…

api.js

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

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

base_polyfills.js

…

extra_polyfills.js

…

initial_state.js

…

is_mobile.js

…

link_header.js

…

load_polyfills.js

…

main.js

bug fix (WebPush does not work) (#6120)

2017-12-28 16:20:34 +01:00

performance.js

…

ready.js

…

rtl.js

…

scroll.js

…

settings.js

…

stream.js

…

test_setup.js

…

uuid.js

…