David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream ...

Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb

2017-09-09 14:27:47 -05:00

..

actions

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

components

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

containers

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

features

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

locales

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

middleware

Remove unused variables (#3906)

2017-06-23 16:05:04 +02:00

reducers

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

selectors

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00

service_worker

Refactor Web::PushSubscription, remove welcome message (#4524)

2017-09-01 13:35:23 +02:00

store

refactor: Make all reducers sync (#4125)

2017-07-09 12:16:08 +02:00

.gitkeep

Replace sprockets/browserify with Webpack (#2617)

2017-05-03 02:04:16 +02:00

api.js

Improve eslint rules (#3147)

2017-05-20 17:31:47 +02:00

base_polyfills.js

Lazy load toots using IntersectionObserver (#3191)

2017-05-24 17:55:00 +02:00

emoji.js

make number of comparison in emojify() fewer (#4500)

2017-08-02 21:05:17 +02:00

emojione_light.js

make number of comparison in emojify() fewer (#4500)

2017-08-02 21:05:17 +02:00

extra_polyfills.js

Add object-fit polyfill for Edge (#4182)

2017-07-14 01:59:34 +02:00

is_mobile.js

Merge upstream (#111)

2017-08-01 13:20:29 -07:00

link_header.js

Improve eslint rules (#3147)

2017-05-20 17:31:47 +02:00

load_polyfills.js

Load extra polyfills when isIntersecting is undefined (#4469)

2017-07-31 19:40:20 +02:00

main.js

Merge changes from upstream with the CSS reload fix

2017-07-18 18:58:47 +02:00

performance.js

Attach ReactPerf to window for easier debugging (#3318)

2017-05-25 21:14:40 +02:00

ready.js

Do not load unnecessary script files (#4193)

2017-07-14 11:08:56 +02:00

rtl.js

Improve RTL detection (#3682)

2017-06-10 15:06:50 +02:00

scroll.js

Scroll smoothly to the right (#4735)

2017-08-29 17:06:19 +02:00

stream.js

Use ws protocol in streaming API base URL (#2606)

2017-05-04 15:55:13 +02:00

uuid.js

Replace sprockets/browserify with Webpack (#2617)

2017-05-03 02:04:16 +02:00

web_push_subscription.js

Remove eslint-disable comments (#4681)

2017-08-24 12:15:36 +02:00