Commit Graph

54 Commits

Author SHA1 Message Date
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
Belen Curcio 74bef18098 user checker 2017-01-26 09:34:47 -03:00
David Jay 31abe57cb2 Merge branch 'master' of github.com:coralproject/talk into moderate-bio
Integrating graphql, updating tests, and preserving transition to ModerationList from CommentList.
2017-01-25 17:15:12 -05:00
Belen Curcio ec0dd34d40 Configure tab while you are loggedOff 2017-01-25 16:33:55 -03:00
Belen Curcio 7c132600f0 Console log and typo 2017-01-25 11:47:35 -03:00
Belen Curcio d19d2ebe48 My Comment History Working - linted 2017-01-25 11:19:34 -03:00
Belen Curcio 30b6f8d112 my Comment History working 🎉 : TADA : 2017-01-25 11:04:23 -03:00
Belen Curcio b1848c28e4 Adding Missing Translations 2017-01-25 07:08:55 -03:00
Belen Curcio e3b183c565 Items cleanup 2017-01-25 05:15:04 -03:00
David Jay b0acdff34d Merge branch 'graphql' of github.com:coralproject/talk into graphql 2017-01-24 16:23:27 -05:00
David Jay 7c3f566202 Handling links inside of iframe in via Pym. 2017-01-24 16:21:49 -05:00
David Jay ce73118f53 Loading history links in parent page. 2017-01-24 16:04:03 -05:00
Wyatt Johnson 0a5a23c1f3 Added fixes for tests on CI 2017-01-24 13:45:06 -07:00
David Jay 74ced3b2fd Removing display of user ID in settings. 2017-01-24 14:35:14 -05:00
David Jay 6e9757ae91 Updating tests to use capitalized admin. 2017-01-24 14:27:50 -05:00
David Jay 4b33199f2f Adding signin button to settings page. 2017-01-24 14:19:20 -05:00
gaba d35875145c Changes field for metadata. Needs to look at this test better. 2016-12-23 15:38:45 -08:00
Wyatt Johnson 7f12741c13 added comments to linter 2016-12-16 16:46:15 -07:00
Riley Davis 647d62969d design tweaks per kim 2016-12-16 12:24:32 -07:00
Riley Davis d599a65c05 file not being used anywhere 2016-12-15 10:44:20 -07:00
Riley Davis 29b6fc08cd hydrate the assets in the comment response 2016-12-14 14:41:54 -07:00
Riley Davis 5962037c21 display list of comments with asset url 2016-12-13 16:03:50 -07:00
Riley Davis 37d8c3ad38 try to request a list of assets and fail 2016-12-13 12:40:06 -07:00
Riley Davis d43cd9caf9 list comments out 2016-12-12 16:26:02 -07:00
Riley Davis c999e1c1a9 use new coralApi fetch 2016-12-12 12:28:10 -07:00
Riley Davis c9a8d448ba use plugin CommentHistory component 2016-12-12 12:20:38 -07:00
Belen Curcio 623c32a002 Configure Stream Ready, Checkbox Coral UI 2016-12-06 12:18:29 -03:00
Belen Curcio 647fb06c99 HandleSave on Submit 2016-12-01 12:58:37 -03:00
Belen Curcio 990782a542 Sign in a restricted rout 2016-12-01 11:17:07 -03:00
Belen Curcio d90a158298 Bio Tooltips 2016-11-30 17:09:34 -03:00
Belen Curcio 6e7926ab30 Working bios 2016-11-30 12:41:50 -03:00
Belen Curcio 2607c608f5 D
ividing userData from userAuth
2016-11-30 10:20:03 -03:00