Commit Graph

3586 Commits

Author SHA1 Message Date
David Erwin e70cfdfd00 Merge pull request #459 from coralproject/support-lazy-assets
Added support for a plugin which disables lazy assets
2017-04-06 10:54:32 -04:00
David Erwin 58f296ef88 Merge branch 'support-lazy-assets' of https://github.com/coralproject/talk into support-lazy-assets 2017-04-06 10:49:30 -04:00
David Erwin 79d5c28d00 Pass asset_id in title route 2017-04-06 10:47:56 -04:00
Chi Vinh Le 7c2b16521a Merge branch 'master' into plugin
Conflicts:
	.eslintignore
	.gitignore
	graph/resolvers/index.js
	plugins.json
2017-04-06 21:22:40 +07:00
Wyatt Johnson 26fff5b950 Merge branch 'master' into support-lazy-assets 2017-04-06 08:21:49 -06:00
David Erwin 2b23a6625f Merge pull request #466 from coralproject/stream-refetch-tweak
only refetch the comments if you're an admin
2017-04-06 10:13:46 -04:00
David Erwin 6f8b375519 Merge branch 'master' into stream-refetch-tweak 2017-04-06 10:03:00 -04:00
David Erwin 73344fa528 Merge pull request #467 from coralproject/fix-collapsing-comments
Fix collapsing comment tree
2017-04-06 10:02:29 -04:00
David Erwin 6117dd3358 Merge branch 'master' into fix-collapsing-comments 2017-04-06 09:57:35 -04:00
Chi Vinh Le 31cdf964f7 Simple camelCase for slot naming 2017-04-06 20:08:41 +07:00
Chi Vinh Le 025df1918d Move slot config to index 2017-04-06 20:06:38 +07:00
Chi Vinh Le 92146f326f camelCase for slot names 2017-04-06 19:55:24 +07:00
Chi Vinh Le a018a8f9bb Fix lint and git ignores 2017-04-06 19:45:09 +07:00
Chi Vinh Le 5cb9fdccf9 Refactor plugin 2017-04-06 19:26:29 +07:00
Chi Vinh Le b64e46c007 Improve performance of RespectButton 2017-04-06 18:31:02 +07:00
Chi Vinh Le 4d51fb276d Fix collapsing comment tree 2017-04-06 17:51:36 +07:00
Chi Vinh Le be64905426 Fix graph not importing plugin resolvers 2017-04-06 17:45:34 +07:00
Chi Vinh Le f91f2b143f Fix undefined client 2017-04-06 17:17:29 +07:00
Chi Vinh Le d32c2f5177 Fix collapsing comment tree 2017-04-06 16:44:50 +07:00
Wyatt Johnson 990fe34873 Merge branch 'master' into support-lazy-assets 2017-04-05 16:21:16 -06:00
Wyatt Johnson ffb0ee20e8 Cleanup of subscriptions 2017-04-05 16:15:22 -06:00
Riley Davis 7b7686bc79 Merge branch 'master' into optional-google-fonts 2017-04-05 16:10:41 -06:00
Riley Davis ca2782ba06 Merge branch 'master' into stream-refetch-tweak 2017-04-05 15:40:48 -06:00
Wyatt Johnson e6dba11984 Merge branch 'master' into subscriptions 2017-04-05 15:31:08 -06:00
David Erwin b335cb3493 Document subscription plugins 2017-04-05 17:26:12 -04:00
David Erwin 6735296c3c Abstract setupFunctions 2017-04-05 17:07:14 -04:00
David Erwin bbf0839890 Merge pull request #465 from coralproject/graph-fix
Fixed for resolver plugin syntax
2017-04-05 17:00:16 -04:00
David Erwin 350d9e74f2 Get plugin setupFuncitons for subscriptions 2017-04-05 16:56:32 -04:00
Wyatt Johnson dfcb661c21 Syntax 2017-04-05 14:47:27 -06:00
Riley Davis e4e2ff03b3 only refetch the comments if you're an admin 2017-04-05 14:41:06 -06:00
Wyatt Johnson c5ce22c5e6 Fixed for syntax 2017-04-05 14:36:35 -06:00
Kim Gardner 44aa98eb28 Merge branch 'master' into optional-google-fonts 2017-04-05 16:05:13 -04:00
Wyatt Johnson b3582025b7 Fixed import 2017-04-05 13:37:32 -06:00
Wyatt Johnson 3c91b9cda1 Merge branch 'master' into subscriptions 2017-04-05 13:36:57 -06:00
David Erwin 5dbeb695a4 Merge pull request #463 from coralproject/facebook-auth-plugin
Facebook Auth Plugin
2017-04-05 15:31:53 -04:00
Wyatt Johnson a270aef42e fixed license 2017-04-05 13:07:56 -06:00
Wyatt Johnson 2bbbf2bbf7 Fixed bug in plugin 2017-04-05 12:33:24 -06:00
Chi Vinh Le b0effe8731 Merge with 'master' 2017-04-06 01:26:48 +07:00
Riley Davis b24ee81e34 remove Lato from google fonts 2017-04-05 12:14:51 -06:00
Chi Vinh Le baf5a34001 Fully working redux+apollo powered plugin 2017-04-06 00:58:16 +07:00
Chi Vinh Le 582f799b6c Revert "Merge"
This reverts commit d9835a17d3, reversing
changes made to 18d6846f4e.
2017-04-06 00:53:21 +07:00
Wyatt Johnson 21eb532c6e Added postinstall hook 2017-04-05 11:49:22 -06:00
Chi Vinh Le 9505ffdedd Revert "to Master"
This reverts commit eef64f5f1b.
2017-04-06 00:44:12 +07:00
Wyatt Johnson 8a06118d94 Added coral facebook auth plugin, some circ dep fixes 2017-04-05 11:39:54 -06:00
Wyatt Johnson 1fecd4589b Removed unused file 2017-04-05 09:55:15 -06:00
David Erwin 48b7a67665 Add comments 2017-04-05 11:24:52 -04:00
Belen Curcio eef64f5f1b to Master 2017-04-05 12:12:33 -03:00
Belen Curcio d9835a17d3 Merge 2017-04-05 12:08:07 -03:00
Wyatt Johnson 877372814a Merge branch 'master' into support-lazy-assets 2017-04-05 08:14:31 -06:00
Wyatt Johnson 45c7cbad9e Merge branch 'master' into subscriptions 2017-04-05 08:08:56 -06:00