85 Commits

Author	SHA1	Message	Date
Chi Vinh Le	b7c4dbd224	Remove CommonJS style exports in framework	2017-07-07 17:27:05 +07: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
Chi Vinh Le	30d4562383	Refactor pagination	2017-06-01 01:18:41 +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	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
gaba	492f4a674c	OMG. Strings.	2017-05-25 12:02:26 -04:00
Chi Vinh Le	b43a0f533b	Harmonize naming in admin and embed-stream	2017-05-25 18:37:23 +07:00
gaba	a184837ff8	Goes back to load all translations...	2017-05-23 12:46:53 -04:00
gaba	f525af4c6e	Added a few more translations that were missing.	2017-05-19 15:42:56 -07:00
gaba	9be443eda8	Moves i18n into coral-framework.	2017-05-19 12:28:44 -07:00
gaba	3aceb0dc38	Merge branch 'master' into i18n-refactor	2017-05-17 12:59:24 -07:00
gaba	5bd9bc992b	Move i18n into a service	2017-05-17 12:53:36 -07:00
Chi Vinh Le	c7e0577708	Merge branch 'master' into invalidate-old-data	2017-05-16 18:17:45 +07:00
Chi Vinh Le	2ab8cc9481	Allow Apollo to invalidate old user data	2017-05-16 18:17:43 +07:00
Chi Vinh Le	e1b80c3317	Only refetch for login	2017-05-16 17:50:17 +07:00
Chi Vinh Le	ec19618052	Readd login fixes	2017-05-16 17:26:53 +07:00
gaba	423cb3cade	Merge branch 'master' into i18n-refactor	2017-05-15 14:02:34 -07:00
Belen Curcio	2b7f545c2d	lint	2017-05-15 17:31:53 -03:00
Belen Curcio	b789a8e107	Removing kiwis fix since this was fixed in auth tokens branch	2017-05-15 17:23:57 -03:00
Belen Curcio	b2e5c0452a	The merge conficts	2017-05-15 17:13:48 -03:00
Chi Vinh Le	def35f0a93	Fix login issues	2017-05-16 00:55:12 +07:00
gaba	b31212f847	Second run of notation change for translations.	2017-05-15 08:35:55 -07:00
Belen Curcio	292f758ac9	Comment history relies on authtokens	2017-05-15 12:17:30 -03:00
Wyatt Johnson	9403280c56	Merge branch 'master' into edit-changes	2017-05-12 15:44:19 -06:00
Wyatt Johnson	e3017efebf	Front end edits to accomedate ignoredUsers	2017-05-12 10:25:59 -06:00
Wyatt Johnson	ae5da93730	linting fixes	2017-05-11 17:44:51 -06:00
Chi Vinh Le	028e13761f	Complete graphql code refactor in framework	2017-05-09 03:05:19 +07:00
Chi Vinh Le	80d08bbe2e	Port StopIgnoringUser Mutation	2017-05-09 02:50:52 +07:00
gaba	c0fc87ea21	Merge branch 'master' into i18n-refactor	2017-05-01 11:28:06 -07:00
gaba	05bf21fe09	Refactoring	2017-04-24 10:08:33 -05:00
Chi Vinh Le	4dc3b0c2f4	Merge branch 'master' into query-composition-2 ... Conflicts: client/coral-embed-stream/src/Embed.js client/coral-embed-stream/src/components/Comment.js client/coral-embed-stream/src/index.js client/coral-framework/services/store.js client/coral-settings/containers/ProfileContainer.js graph/resolvers/root_query.js	2017-04-24 15:24:34 +07:00
Chi Vinh Le	f0e584f0b3	Restore login flow in ProfileContainer	2017-04-21 00:52:45 +07:00
Chi Vinh Le	348c01ae80	Fix linting errors	2017-04-20 20:58:45 +07:00
Belen Curcio	6155a46e71	Sign up popup	2017-04-19 18:10:09 -03:00
Chi Vinh Le	af5be0469f	Refactor embed	2017-04-18 23:20:39 +07:00
Benjamin Goering	2656141d59	Add stopIgnoringUser mutation and Embed uses it	2017-04-11 14:19:34 -07:00
Benjamin Goering	c59ddb72a6	Manage ignored users UI	2017-04-11 14:19:34 -07:00
Pablo Cúbico	5092b849b3	Found some typos on the spanish side :)	2017-03-28 23:22:12 -03:00
gaba	35c8e1b5f9	Check spanish translations	2017-03-22 17:27:43 -07:00
Wyatt Johnson	cefe872bf0	Fixed queries	2017-03-01 16:38:27 -07:00
Riley Davis	886240a7bc	translations. remove console.log on frontend. remove notification on POST moderation	2017-02-24 11:11:18 -07:00
David Jay	2456fe5145	Merge branch 'master' into comment-design-pass	2017-02-23 16:22:35 -05:00
David Jay	c1e3aec181	Updating styles.	2017-02-23 16:20:20 -05:00
David Jay	4cc3426af4	Adding bolding, adding translations to settings page.	2017-02-23 16:07:41 -05:00
Riley Davis	f76befd6ac	no comments in user list	2017-02-21 12:48:01 -07:00
Wyatt Johnson	3cd2b28bc2	Inital rename of displayName -> username	2017-02-09 16:48:59 -07:00
Belen Curcio	a4d62f78f2	Apollo config ready	2017-02-07 20:10:18 -03:00
David Jay	6c01a37f6a	Removing user bio.	2017-02-01 11:48:16 -05:00
David Jay	f06edec6a2	Merge branch 'master' of github.com:coralproject/talk into moderate-bio	2017-01-26 16:38:43 -05:00