Chi Vinh Le 4dc3b0c2f4 Merge branch 'master' into query-composition-2 ...

Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/index.js
	client/coral-framework/services/store.js
	client/coral-settings/containers/ProfileContainer.js
	graph/resolvers/root_query.js

2017-04-24 15:24:34 +07:00

..

actions

Merge branch 'master' into query-composition-2

2017-04-24 15:24:34 +07:00

components

Slot component wraps in inline element, not block (which can affect other styles)

2017-04-11 14:20:38 -07:00

constants

Move query logic to coral-embed-stream

2017-04-19 20:28:14 +07:00

graphql

Move query logic to coral-embed-stream

2017-04-19 20:28:14 +07:00

helpers

Move slot config to index

2017-04-06 20:06:38 +07:00

loaders

Adjusted loaders, webpack

2017-04-06 17:42:50 -06:00

modules/i18n

remove notification reducer. have parent show notifications

2017-03-06 10:59:12 -07:00

reducers

Merge branch 'master' into query-composition-2

2017-04-24 15:24:34 +07:00

services

Merge branch 'master' into query-composition-2

2017-04-24 15:24:34 +07:00

utils

remove null checks

2017-04-20 10:04:28 -06:00

index.js

Fix crashing admin when using framework

2017-04-20 18:45:55 +07:00

mocks.json

Adding mock comments

2016-11-01 15:06:09 -07:00

translations.json

Update spanish translation for commentIsIgnored

2017-04-11 14:31:46 -07:00