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

..

coral-admin/src

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

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

coral-configure

Added a few more translations that were missing.

2017-05-19 15:42:56 -07:00

coral-docs/src

add plugins

2017-03-28 15:56:24 -03:00

coral-embed/src

Adding config with initial

2017-05-09 15:53:57 -03:00

coral-embed-stream

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

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

coral-framework

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

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

coral-plugin-api

Exports

2017-05-10 15:53:33 -03:00

coral-plugin-author-name

linting fixes

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

coral-plugin-best

Moves i18n into coral-framework.

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

coral-plugin-comment-count

Moves i18n into coral-framework.

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

coral-plugin-commentbox

Moves i18n into coral-framework.

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

coral-plugin-commentcontent

Fixing permalink icon and adding padding to comment content.

2017-02-23 17:08:35 -05:00

coral-plugin-flags

Moves i18n into coral-framework.

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

coral-plugin-history

Merge branch 'master' into i18n-refactor

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

coral-plugin-infobox

linting fixes

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

coral-plugin-moderation

Moves i18n into coral-framework.

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

coral-plugin-permalinks

Moves i18n into coral-framework.

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

coral-plugin-pubdate

Moves i18n into coral-framework.

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

coral-plugin-questionbox

Adding Slots to QuestionBox, ref

2017-04-26 22:35:30 -03:00

coral-plugin-replies

Moves i18n into coral-framework.

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

coral-plugin-tag-label

Indicate best comments. Add some aria labels

2017-02-28 19:59:34 +08:00

coral-settings

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

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

coral-sign-in/containers

Merge branch 'master' into i18n-refactor

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

coral-ui

initial style updates on comment stream for PT 142803055 ~ copy translations still needed

2017-05-25 17:21:32 -04:00

.babelrc

add plugins

2017-03-28 15:56:24 -03:00

.eslintrc.json

Patched silly bug

2017-02-24 09:57:24 -07:00