Commit Graph

5079 Commits

Author SHA1 Message Date
Kim Gardner 99b8b4e90b Bump version 2.5.0 2017-07-19 15:34:04 -04:00
Kim Gardner 139802381f Merge pull request #775 from coralproject/recursively-resolve-fragments
Recursively resolve fragments
2017-07-19 15:29:06 -04:00
Kim Gardner fa02d44270 Merge branch 'master' into recursively-resolve-fragments 2017-07-19 14:32:02 -04:00
Kim Gardner 2b7f46efc7 Merge pull request #769 from coralproject/excludeIf-api
Conditionally exclude a Plugin Component from a Slot
2017-07-19 13:03:49 -04:00
Chi Vinh Le 55ff0bcf8c Recursively resolve fragments 2017-07-19 22:58:27 +07:00
Belén Curcio d61374993a Merge branch 'master' into excludeIf-api 2017-07-19 11:47:51 -03:00
Kim Gardner 980dc2515e Merge pull request #774 from coralproject/resolve-slot-fragments-lazy
Support lazily resolving slot fragments
2017-07-19 10:45:19 -04:00
Chi Vinh Le 52cd7bcce4 Expose getSlotFragmentSpread in plugin-api 2017-07-19 20:59:03 +07:00
Chi Vinh Le 5fee26da0e Document getSlotFragmentSpreads 2017-07-19 20:50:00 +07:00
Chi Vinh Le d99f6d8923 Support lazily resolving slot fragments 2017-07-19 20:44:22 +07:00
Kim Gardner 73d15f34d7 Merge branch 'master' into excludeIf-api 2017-07-18 10:10:20 -04:00
Kim Gardner 1183550e14 Merge pull request #768 from coralproject/docs-microservices
Write microservice docs
2017-07-18 10:05:37 -04:00
Kim Gardner 9990142740 Merge branch 'master' into docs-microservices 2017-07-18 09:58:54 -04:00
Kim Gardner 33bd2f576a Merge branch 'master' into excludeIf-api 2017-07-18 09:58:44 -04:00
Wyatt Johnson 13cac731b9 Merge pull request #773 from icco/patch-1
Fix email address env var in docs
2017-07-17 15:29:40 -06:00
Nat Welch ab87500303 Fix email address env var in docs 2017-07-17 17:02:46 -04:00
Andrew Losowsky 244d421eda Merge pull request #770 from coralproject/autoflag-suspect
Added new TALK_DISABLE_AUTOFLAG_SUSPECT_WORDS option
2017-07-17 13:28:04 -07:00
Wyatt Johnson d5dfd89d94 review of docs 2017-07-17 10:54:54 -06:00
Wyatt Johnson d82735b2b5 Adjusted docs 2017-07-17 10:50:40 -06:00
Wyatt Johnson b091cf5221 Added new TALK_DISABLE_AUTOFLAG_SUSPECT_WORDS option 2017-07-17 10:43:28 -06:00
Chi Vinh Le d90f87428c Remove changes in featured 2017-07-17 19:37:01 +07:00
Chi Vinh Le 41f5297d78 Deprecate isSlotEmpty in the plugins api 2017-07-17 19:32:48 +07:00
Chi Vinh Le 0e9d9067f9 Use plugin-api and port plugins to it 2017-07-17 19:28:02 +07:00
Chi Vinh Le d2e6a98d46 connect aware "excludeIf" using our own hoc 2017-07-17 18:06:51 +07:00
Chi Vinh Le 4dd03508ee Merge branch 'master' into excludeIf-api 2017-07-17 17:15:16 +07:00
Chi Vinh Le fb2662572a Implement excludeIf for the plugins API 2017-07-17 17:06:12 +07:00
David Erwin 0069f31244 Make it accurate 2017-07-14 16:07:47 -04:00
David Erwin b235b8334e Give some context 2017-07-14 16:06:47 -04:00
David Erwin acb7028471 Write microservice docs 2017-07-14 16:01:57 -04:00
David Erwin af3489db9c Merge pull request #767 from coralproject/update-node
Update Node version to 7.10.1
2017-07-14 14:27:08 -04:00
Kim Gardner 05e2302794 Update CircleCI node version 2017-07-14 13:31:35 -04:00
Kim Gardner c610c319de Downgrade to 7.10.1 due to dependency issues 2017-07-14 13:16:38 -04:00
Kim Gardner 04d330cf5b Update node version in CircleCI config 2017-07-14 12:41:15 -04:00
Kim Gardner 8cbb56af19 Update default node version for Talk 2017-07-14 12:40:39 -04:00
Kim Gardner d4cb07e448 Update node version in Dockerfile 2017-07-14 12:39:48 -04:00
Kim Gardner 9455eea041 Merge pull request #766 from coralproject/add-code-of-conduct-1
Created Code of Conduct
2017-07-14 11:23:56 -04:00
Andrew Losowsky e8bbd7e4d7 Created Code of Conduct
Merged ours with the Contributor Covenant
2017-07-14 10:34:58 -04:00
Kim Gardner 28e589de21 Merge pull request #765 from coralproject/remove-like-plugin-as-default
Remove "like" from default plugins
2017-07-13 14:32:19 -04:00
Kim Gardner 31cfddf93c Remove "like" from default plugins 2017-07-13 14:20:26 -04:00
Kim Gardner 562f2350c1 Merge pull request #764 from coralproject/update-readme-recipes
Update README with info about Recipes
v2.4.0
2017-07-13 13:10:42 -04:00
Kim Gardner ea6330bf94 Update README with info about Recipes 2017-07-13 13:01:47 -04:00
Kim Gardner 0be3dc2ceb Merge pull request #751 from coralproject/talk-plugin-avatar
Talk Plugin Avatar
2017-07-13 12:54:04 -04:00
Kim Gardner eb98b32d21 Merge branch 'master' into talk-plugin-avatar 2017-07-13 12:13:58 -04:00
Kim Gardner 127ee25d7f Merge pull request #763 from coralproject/docs-trouble
Add install troubleshooting doc
2017-07-13 12:13:40 -04:00
David Erwin ed4a3c3250 Merge branch 'master' into docs-trouble 2017-07-13 12:05:09 -04:00
David Erwin 7b53048a91 Add install troubleshooting doc 2017-07-13 12:04:18 -04:00
Chi Vinh Le 28e94d30b0 Only show seperator on top-level comments 2017-07-13 23:00:52 +07:00
Chi Vinh Le 1c2fec29a4 Merge branch 'master' into talk-plugin-avatar
Conflicts:
	client/coral-embed-stream/src/components/Comment.css
2017-07-13 22:58:35 +07:00
Kim Gardner 56cc4989fd Merge pull request #761 from coralproject/docs-metadata
Docs metadata
2017-07-13 11:53:58 -04:00
Kim Gardner b32aebd6f1 Merge branch 'master' into docs-metadata 2017-07-13 11:47:40 -04:00