Commit Graph

4030 Commits

Author SHA1 Message Date
Chi Vinh Le 2be73d1df2 Unsubscribe on unmount 2017-06-06 02:10:56 +07:00
Chi Vinh Le 3ad17f008f Refactor fetchMore updaters 2017-06-06 01:44:17 +07:00
David Erwin 90d7e3706c Improve auth token logic. 2017-06-05 13:58:13 -04:00
Chi Vinh Le 9993350b7e Animate flash for new comments 2017-06-06 00:54:12 +07:00
David Erwin 7c66d846c2 Add auth token comment 2017-06-05 13:38:06 -04:00
Chi Vinh Le 6b0cdae183 Subscribe to comments 2017-06-05 20:51:08 +07:00
Kiwi 7efdccb683 Merge branch 'master' into auth-token-via-config 2017-06-05 17:57:13 +07:00
Chi Vinh Le a9796d47cd Check login after loading config 2017-06-05 17:51:06 +07:00
Chi Vinh Le 7c145bbb3c Refactor import order and framework initialization 2017-06-05 17:49:43 +07:00
Chi Vinh Le ac9e70bc67 Add same getAuthToken logic to apollo transport 2017-06-05 17:48:09 +07:00
Kim Gardner 6e483842f1 Merge branch 'master' into user-comment-history 2017-06-02 17:22:48 -04:00
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 e097b8eb21 design pass 2017-06-02 13:50:00 -06: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
David Erwin ea3d8e141d Use config auth_token if present on http headers 2017-06-02 14:22:06 -04: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