Commit Graph

4191 Commits

Author SHA1 Message Date
Chi Vinh Le 109f4b2c0f Handle mutation errors 2017-05-31 00:44:16 +07:00
Kiwi 4f8ef88bd0 Merge branch 'master' into integrate-admin-graphql-framework 2017-05-31 00:24:06 +07:00
Kiwi 3160f6ae9e Merge pull request #604 from coralproject/graphql-errors-handling
Support response errors in the graphql framework
2017-05-31 00:21:14 +07:00
Kiwi 15a11dca4d Merge branch 'master' into graphql-errors-handling 2017-05-30 20:48:58 +07:00
Kiwi d28ba0028d Merge branch 'master' into integrate-admin-graphql-framework 2017-05-30 20:48:53 +07:00
Kiwi f42dd884c0 Merge pull request #617 from coralproject/forget-password-ports
Allow domains with ports
2017-05-30 20:48:42 +07:00
Kiwi 4a0785f6fe Merge branch 'master' into graphql-errors-handling 2017-05-30 20:18:32 +07:00
Kiwi 336e0373cd Merge branch 'master' into integrate-admin-graphql-framework 2017-05-30 20:16:09 +07:00
David Erwin bbed3e2a7f Merge branch 'master' into forget-password-ports 2017-05-30 08:56:07 -04:00
David Erwin c894e8eb1d Merge pull request #616 from coralproject/fix-redirect-uri
Use correct redirect url
2017-05-30 08:55:44 -04:00
Chi Vinh Le 68f6c8acb6 No shared store between popup and embed 2017-05-30 01:08:45 +07:00
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
Chi Vinh Le 04ef1c5be5 Use new translation service 2017-05-29 22:45:56 +07:00
Chi Vinh Le a598bca12b Allow domains with ports 2017-05-29 22:10:16 +07:00
Kiwi 810f337d8d Merge branch 'master' into fix-redirect-uri 2017-05-29 22:06:33 +07:00
Kiwi c314054143 Merge branch 'master' into graphql-errors-handling 2017-05-29 22:00:49 +07:00
Chi Vinh Le bd5e272f00 Use correct redirect url 2017-05-29 22:00:27 +07:00
Kiwi bdbc7c5ff2 Merge pull request #586 from coralproject/i18n-refactor
Refactor i18n
2017-05-29 21:59:52 +07:00
Chi Vinh Le 2d398fe452 Change not authorized error message 2017-05-29 20:36:21 +07:00
Chi Vinh Le 0b7432b75e Merge branch 'master' into i18n-refactor
Conflicts:
	client/coral-sign-in/components/FakeComment.js
	client/coral-sign-in/components/UserBox.js
2017-05-29 20:23:27 +07:00
Chi Vinh Le 9a6532ecea Merge branch 'master' into integrate-admin-graphql-framework
Conflicts:
	client/coral-embed-stream/src/index.js
2017-05-29 20:09:03 +07:00
Kiwi f3f6633e99 Merge branch 'master' into graphql-errors-handling 2017-05-29 19:42:26 +07:00
David Erwin 93f8a81678 Merge pull request #607 from coralproject/unified-docs
Unified docs
2017-05-27 09:59:08 -04:00
Kim Gardner b13d3adce0 Merge branch 'master' into unified-docs 2017-05-26 17:00:53 -04:00
Kim Gardner d213a4a26e Merge pull request #613 from coralproject/minor-stream-style-changes
Stream and mod queue style fixes
2017-05-26 17:00:09 -04:00
Kim Gardner 82d442d95b Merge branch 'master' into minor-stream-style-changes 2017-05-26 16:53:55 -04:00
Kim Gardner 1dcd254519 Merge branch 'master' into unified-docs 2017-05-26 16:53:36 -04:00
Kim Gardner 37262ad9f6 Merge branch 'master' into graphql-errors-handling 2017-05-26 16:53:13 -04:00
Kim Gardner e6c40a5839 Merge pull request #615 from coralproject/require-email-info
Display require email verification info
v1.7.0
2017-05-26 16:24:06 -04:00
Chi Vinh Le 681e07306b Require email verification info 2017-05-27 03:13:00 +07:00
Kim Gardner 794af5a670 Merge pull request #611 from coralproject/auth-flow
FE Auth Flow and fix for Safari token workaround
2017-05-26 16:06:32 -04:00
Chi Vinh Le 81e8a593b3 Merge branch 'auth-flow' of ssh://github.com/coralproject/talk into auth-flow 2017-05-27 02:51:56 +07:00
Chi Vinh Le 89cb4c4502 Resolve infinite loop 2017-05-27 02:45:59 +07:00
Kim Gardner e9c8876a8f Merge branch 'master' into auth-flow 2017-05-26 15:44:12 -04:00
Kim Gardner e68124a426 Merge pull request #614 from coralproject/update-core-plugins
Update default plugins that ship with Coral core
2017-05-26 15:43:27 -04:00
Chi Vinh Le 8713a2ae87 Enable Linting 2017-05-27 02:08:54 +07:00
Kim Gardner 54e7956af5 Update default plugins that ship with Coral core 2017-05-26 15:08:47 -04:00
Chi Vinh Le ee2068f5f1 Merge branch 'master' into auth-flow
Conflicts:
	client/coral-admin/src/actions/auth.js
2017-05-27 01:07:19 +07:00
Chi Vinh Le 52b3dcab43 Fix changing username not updating 2017-05-27 01:05:12 +07:00
Chi Vinh Le a7cdcb0bf7 Fix request options and use better filename 2017-05-27 00:54:36 +07:00
Chi Vinh Le 99a9154d40 Remove unused dependency 2017-05-27 00:26:04 +07:00
IAmSamHankins 05e5200e79 moderation panel design cleanup PT 144120491 2017-05-26 12:48:15 -04:00
Kim Gardner 3b96d08b58 Merge pull request #612 from coralproject/losowsky-patch-1
added iphone 7 support in the list
2017-05-26 12:46:38 -04:00
Andrew Losowsky 82c5d140be added iphone 7 support in the list 2017-05-26 12:30:26 -04:00
David Erwin 69a9afe084 Remove old docs 2017-05-26 11:40:56 -04:00
David Erwin 1d3a75e425 Update doc menu title 2017-05-26 11:39:24 -04:00
David Erwin 5f83584e48 Update tooling and client architecture docs 2017-05-26 11:37:33 -04:00
David Erwin 1dbecab13e Add swagger user docs and tools page 2017-05-26 11:27:10 -04:00
David Erwin deea24d0c5 Add docs to .eslintignore 2017-05-26 11:12:16 -04:00
David Erwin ce46329e27 Create FAQ page 2017-05-26 11:07:10 -04:00