Commit Graph

5043 Commits

Author SHA1 Message Date
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
Kim Gardner 244a276e1a Merge pull request #760 from coralproject/styles-fixes-2
Remove some global css, fix some styling issues
2017-07-13 11:46:28 -04:00
Kim Gardner 245561bd52 Merge branch 'master' into talk-plugin-avatar 2017-07-13 11:42:59 -04:00
Kim Gardner d05a63bc2e Merge branch 'master' into docs-metadata 2017-07-13 11:42:53 -04:00
Kim Gardner 5d118c26d1 Merge branch 'master' into styles-fixes-2 2017-07-13 11:42:04 -04:00
Belén Curcio 5ab5b7ca70 Merge pull request #762 from coralproject/reply-error-fix
BUG: Console error when you reply to a comment
2017-07-13 12:41:30 -03:00
Chi Vinh Le b79c990ee5 Only setState once 2017-07-13 22:34:53 +07:00
Belen Curcio 1541a618b5 Reordering divs 2017-07-13 12:29:06 -03:00
David Erwin 30b200d734 Fix typos 2017-07-13 10:58:31 -04:00
David Erwin dc76d89c47 Fewer, better words 2017-07-13 10:49:38 -04:00
Belen Curcio 3d80df1db6 Support for empty slot 2017-07-13 11:37:54 -03:00
Chi Vinh Le 83832abd72 More fixes 2017-07-13 21:37:08 +07:00
David Erwin 47fd522f68 Add first draft 2017-07-13 10:25:36 -04:00
Chi Vinh Le 1280b16bcd Remove some global css, fix some styling issues 2017-07-13 20:47:30 +07:00
David Erwin 3d666111b0 Add metadata docs 2017-07-13 09:26:37 -04:00
David Erwin 919bdff40a Use less words, say same thing 2017-07-13 09:26:09 -04:00
Belen Curcio 518b7b5358 merge 2017-07-12 15:04:24 -03:00
Belen Curcio 8b9463f501 Merge branch 'master' into talk-plugin-avatar 2017-07-12 15:01:14 -03:00
Belen Curcio f5313c0aed Merge branch 'master' of github.com:coralproject/talk into talk-plugin-avatar 2017-07-12 15:00:03 -03:00
Kim Gardner c59c09e1f4 Merge pull request #759 from coralproject/styles-quick-fix
Style glitches quick fix
2017-07-12 13:57:43 -04:00
Belen Curcio e98dcb6647 Merge branch 'master' of github.com:coralproject/talk into talk-plugin-avatar 2017-07-12 14:53:14 -03:00
Belen Curcio 39db11569f Merge branch 'talk-plugin-avatar' of github.com:coralproject/talk into talk-plugin-avatar 2017-07-12 14:52:18 -03:00
Belen Curcio c3ad47f6f6 Linting 2017-07-12 14:49:46 -03:00
Kiwi b9cb1a783f Merge branch 'master' into styles-quick-fix 2017-07-12 19:42:04 +02:00
Chi Vinh Le ea51fdf6cc Styles glitches quick fix 2017-07-13 00:39:55 +07:00
Kim Gardner 324aa6db32 Merge pull request #757 from coralproject/query-by-tags
Allow query comments and comment counts by tags
2017-07-12 13:35:00 -04:00
Belen Curcio 9065a64d13 Merge branch 'master' of github.com:coralproject/talk into talk-plugin-avatar 2017-07-12 14:33:00 -03:00
Kim Gardner 9b36fcebe9 Merge branch 'master' into query-by-tags 2017-07-12 12:21:20 -04:00
Kim Gardner 5d9d01d87f Merge pull request #749 from coralproject/extendable-tab-menu
Extendable Stream Tab Panel
2017-07-12 12:20:22 -04:00
Chi Vinh Le 7f85129044 Merge branch 'master' into extendable-tab-menu
Conflicts:
	client/coral-embed-stream/src/components/Embed.js
	client/coral-embed-stream/style/default.css
	client/coral-framework/helpers/plugins.js
	client/coral-plugin-replies/ReplyButton.css
	client/coral-plugin-replies/ReplyButton.js
	plugins/coral-plugin-like/client/LikeButton.js
	plugins/coral-plugin-like/client/styles.css
	plugins/coral-plugin-love/client/LoveButton.js
	plugins/coral-plugin-love/client/styles.css
2017-07-12 22:38:05 +07:00
Chi Vinh Le fc31a2882d Add a comment 2017-07-12 21:05:29 +07:00
Chi Vinh Le 23cc3548d4 Query by tags 2017-07-12 20:55:54 +07:00
Belén Curcio 574f5b7cea Merge branch 'master' into talk-plugin-avatar 2017-07-12 09:12:41 -03:00
Belen Curcio b19e050399 Merge branch 'master' of github.com:coralproject/talk 2017-07-12 09:10:48 -03:00
David Erwin ef3c82fee1 Merge pull request #758 from coralproject/docs-architecture-cli
Create cli docs
2017-07-11 16:57:54 -04:00
Kim Gardner 202e7a2b10 Merge branch 'master' into talk-plugin-avatar 2017-07-11 16:33:21 -04:00
Kim Gardner 2588f3946d Merge branch 'master' into docs-architecture-cli 2017-07-11 16:32:52 -04:00