Chi Vinh Le 1acf58182f Merge branch 'master' into integrate-admin-graphql-framework ...

Conflicts:
	client/coral-admin/src/containers/Community/Loading.js
	client/coral-admin/src/containers/Community/Table.js
	client/coral-admin/src/containers/Streams/Stories.js
	client/coral-admin/src/index.js
	client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
	client/coral-admin/src/routes/Community/components/People.js
	client/coral-admin/src/routes/Configure/components/Configure.js
	client/coral-admin/src/routes/Configure/components/Domainlist.js
	client/coral-admin/src/routes/Configure/components/EmbedLink.js
	client/coral-admin/src/routes/Configure/components/ModerationSettings.js
	client/coral-admin/src/routes/Configure/components/StreamSettings.js
	client/coral-admin/src/routes/Configure/components/TechSettings.js
	client/coral-admin/src/routes/Configure/components/Wordlist.js
	client/coral-admin/src/routes/Dashboard/components/CountdownTimer.js
	client/coral-admin/src/routes/Install/components/Steps/AddOrganizationName.js
	client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
	client/coral-admin/src/routes/Install/components/Steps/FinalStep.js
	client/coral-admin/src/routes/Install/components/Steps/InitialStep.js
	client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js
	client/coral-admin/src/routes/Install/components/translations.json
	client/coral-admin/src/routes/Moderation/components/Moderation.js
	client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
	client/coral-admin/src/routes/Stories/components/Stories.js
	client/coral-embed-stream/src/index.js

2017-05-29 23:06:40 +07:00

..

actions

Merge branch 'master' into i18n-refactor

2017-05-29 20:23:27 +07:00

components

Merge branch 'master' into i18n-refactor

2017-05-19 12:44:34 -07:00

constants

Require email verification info

2017-05-27 03:13:00 +07:00

graphql

Use default response fragments 2

2017-05-25 18:57:42 +07:00

helpers

Merge branch 'master' into i18n-refactor

2017-05-29 20:23:27 +07:00

hocs

Support store in withMutation

2017-05-25 22:19:16 +07:00

loaders

linting fixes

2017-05-11 17:44:51 -06:00

reducers

Require email verification info

2017-05-27 03:13:00 +07:00

services

Merge branch 'master' into integrate-admin-graphql-framework

2017-05-29 23:06:40 +07:00

utils

Wrap queries with hocs

2017-05-24 21:00:17 +07:00

index.js

Simplify i18n + fallback to default language

2017-05-24 01:38:50 +07:00

mocks.json

Adding mock comments

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