Commit Graph

18 Commits

Author SHA1 Message Date
David Erwin 077daeb793 Merge branch 'master' into subscriptions 2017-04-26 16:55:32 -04: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
Wyatt Johnson 1f562c8fad Merge branch 'master' into subscriptions 2017-04-20 15:17:44 -06:00
Chi Vinh Le 5b7750f7a5 Reuse same store and action flows 2017-04-20 23:48:30 +07:00
Wyatt Johnson ecbb66e270 Fix linting 2017-04-18 15:53:15 -06:00
Wyatt Johnson 45094fd176 Optimized sub model 2017-04-18 15:48:33 -06:00
Chi Vinh Le af5be0469f Refactor embed 2017-04-18 23:20:39 +07:00
Wyatt Johnson 97e3d7220e Removed test code 2017-04-10 14:39:50 -06:00
Wyatt Johnson 7acaaadcd6 Merge branch 'master' into subscriptions 2017-04-10 14:33:08 -06:00
Chi Vinh Le f91f2b143f Fix undefined client 2017-04-06 17:17:29 +07:00
Wyatt Johnson 45c7cbad9e Merge branch 'master' into subscriptions 2017-04-05 08:08:56 -06:00
Chi Vinh Le 18d6846f4e Implement apollo reporter middleware 2017-04-05 19:37:10 +07:00
Chi Vinh Le 528f5738c8 Implement apollo reporter middleware 2017-04-05 11:18:45 +07:00
Chi Vinh Le 6e2fd0851e Better graphQL id 2017-04-04 18:30:41 +07:00
Wyatt Johnson ffbe976760 working websockets 2017-03-29 09:35:56 -06:00
Wyatt Johnson 63ef49d595 Initial subscription impl 2017-03-23 11:09:14 -06:00
Riley Davis 0d141e7472 explicit return for clarity 2017-02-08 14:12:17 -07:00
Belen Curcio a4d62f78f2 Apollo config ready 2017-02-07 20:10:18 -03:00