2346 Commits

Author	SHA1	Message	Date
Gabriela Rodríguez Berón	cbf83206b8	Merge branch 'master' into i18n-emails	2017-06-02 13:35:09 -07:00
Kim Gardner	bd60eca6f9	Merge branch 'master' into user-comment-history	2017-06-02 15:58:54 -04:00
Riley Davis	22c2843ae5	remove moderate link per designs	2017-06-02 13:12:59 -06:00
Riley Davis	d8cb560755	add a tab for All/Rejected user detail comments	2017-06-02 13:02:22 -06:00
gaba	eadbb03c15	Fix typo.	2017-06-02 06:54:01 -07:00
gaba	b6dbb5975f	Adds missing translations.	2017-06-01 17:26:49 -07:00
gaba	fd1cf8121e	Move start to the left.	2017-06-01 17:21:55 -07:00
gaba	44d82f8b13	Merge branch 'master' into i18n-emails	2017-06-01 16:26:44 -07:00
Riley Davis	8d25b766ff	Merge branch 'master' into user-comment-history	2017-06-01 15:47:54 -06:00
Riley Davis	555d54425a	implement kiwi's pagination changes	2017-06-01 15:34:05 -06:00
StephanieDClark	1bf2053cb8	Add isReply to commentInputDetailArea api	2017-06-01 11:01:57 -07:00
Riley Davis	d981b5a85b	Merge branch 'master' into user-comment-history	2017-06-01 10:52:24 -06:00
Kim Gardner	b8015506df	Merge branch 'master' into dec-inc-total-comment-count	2017-06-01 11:54:49 -04:00
Chi Vinh Le	fa08450185	Increase/Decrease totalCommentCount after mutation	2017-06-01 22:39:05 +07:00
Chi Vinh Le	d9acbbad96	Fix translation bug in CommentCount	2017-06-01 22:37:25 +07:00
Chi Vinh Le	33eff78a64	Always request comment id	2017-06-01 19:49:53 +07:00
Chi Vinh Le	5245755d49	Add some comments	2017-06-01 19:41:08 +07:00
Chi Vinh Le	ebdd586d1e	Fix mutation funkiness on permlink view	2017-06-01 18:47:07 +07:00
Chi Vinh Le	9a2b6b3ae1	Merge branch 'master' into pagination-refactor	2017-06-01 17:15:42 +07:00
gaba	276b2c7591	Merge branch 'master' into i18n-emails	2017-05-31 15:31:14 -07:00
gaba	a126c94aa4	Adds service for translations in the backend. Clean yaml.	2017-05-31 13:55:27 -07:00
Riley Davis	576cbed8e9	no more errors	2017-05-31 13:44:38 -06:00
Kim Gardner	bf15354aa2	Merge branch 'master' into user-comment-history	2017-05-31 15:17:00 -04:00
Chi Vinh Le	b402f70f38	Hide comment box during perm view	2017-06-01 01:34:32 +07:00
Chi Vinh Le	30d4562383	Refactor pagination	2017-06-01 01:18:41 +07:00
riley	6e458e0149	resolve missing files	2017-05-31 10:54:34 -06:00
Riley Davis	259ce9c9fb	merge master	2017-05-31 10:36:01 -06:00
Riley Davis	6599ed2b4c	Merge branch 'master' into user-comment-history	2017-05-30 15:53:36 -06:00
Riley Davis	29753a958b	show comments on the UserDetail drawer	2017-05-30 15:50:56 -06:00
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	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
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
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
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
Kim Gardner	82d442d95b	Merge branch 'master' into minor-stream-style-changes	2017-05-26 16:53:55 -04:00
Kim Gardner	37262ad9f6	Merge branch 'master' into graphql-errors-handling	2017-05-26 16:53:13 -04:00
Chi Vinh Le	681e07306b	Require email verification info	2017-05-27 03:13:00 +07: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	a7cdcb0bf7	Fix request options and use better filename	2017-05-27 00:54:36 +07:00
IAmSamHankins	05e5200e79	moderation panel design cleanup PT 144120491	2017-05-26 12:48:15 -04:00
Chi Vinh Le	6a1befc3f0	Detect mobile safari & desktop safari	2017-05-26 20:48:24 +07:00
Chi Vinh Le	bab47c9d44	Separate store	2017-05-26 20:37:06 +07:00