Commit Graph
7 Commits
Author SHA1 Message Date
Belen Curcio de6492a26d Ádding reactions, commentContent and updating current Slot 2017-04-26 23:06:09 -03:00
Chi Vinh Le eb9846ba40 Merge branch 'master' into query-composition
Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-embed-stream/src/Stream.js
2017-04-26 01:22:14 +07:00
Chi Vinh Le 54ea71bedf Support fragments in plugins 2017-04-25 18:24:25 +07: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 d3b81dff35 Merge branch 'master' into embed-refactor
Conflicts:
	client/coral-plugin-commentbox/CommentBox.js
2017-04-19 00:18:50 +07:00
Chi Vinh Le af5be0469f Refactor embed 2017-04-18 23:20:39 +07:00
Chi Vinh Le b40eed4751 Move to components folder 2017-04-18 23:14:28 +07:00