Commit Graph

5039 Commits

Author SHA1 Message Date
Belen Curcio b8d00ec9ce Adding go to conversation 2017-07-13 17:29:54 -03:00
Belen Curcio b5ce16a33b Styling 2017-07-13 16:56:40 -03:00
Belen Curcio f8a6987476 Styles 2017-07-13 16:36:41 -03:00
Belen Curcio 1b97811cb0 Querying by featured comments 2017-07-13 15:30:06 -03:00
Kim Gardner 56cc4989fd Merge pull request #761 from coralproject/docs-metadata
Docs metadata
2017-07-13 11:53:58 -04:00
Belen Curcio d72df73d6f Implementing first draft of FC 2017-07-13 12:53:01 -03: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 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 8d4c0c6721 WIP 2017-07-13 12:15:13 -03:00
Belen Curcio 195592b9ab Merge branch 'master' into featured-comments 2017-07-13 12:08:02 -03:00
Belen Curcio da46d27e5b Merge branch 'featured-comments' of github.com:coralproject/talk into featured-comments 2017-07-13 12:07:23 -03:00
Belen Curcio bfbe8d44aa Merg 2017-07-13 12:05:53 -03:00
Belen Curcio da6965122f Merge branch 'master' of github.com:coralproject/talk into featured-comments 2017-07-13 12:04:04 -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
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
Kim Gardner c59c09e1f4 Merge pull request #759 from coralproject/styles-quick-fix
Style glitches quick fix
2017-07-12 13:57:43 -04: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
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
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 32211c4e37 Merge branch 'master' into featured-comments 2017-07-11 16:33:34 -04:00
Kim Gardner 2588f3946d Merge branch 'master' into docs-architecture-cli 2017-07-11 16:32:52 -04:00
Kim Gardner 1c2e850a07 Merge pull request #756 from coralproject/bump-version-2-4-0
Update version to 2.4.0
2017-07-11 16:23:16 -04:00
Kim Gardner 0e8ecb37f3 Merge branch 'master' into bump-version-2-4-0 2017-07-11 16:11:33 -04:00
David Erwin d1b96f5830 Merge branch 'docs-architecture-cli' of https://github.com/coralproject/talk into docs-architecture-cli 2017-07-11 15:06:07 -04:00
David Erwin a9c6014634 Add more info 2017-07-11 15:05:52 -04:00
Kim Gardner 125168c7c8 Merge branch 'master' into docs-architecture-cli 2017-07-11 14:58:41 -04:00
David Erwin eafcadd6a1 Warn users more 2017-07-11 14:43:59 -04:00
David Erwin 211f24476a Create cli docs 2017-07-11 14:39:26 -04:00
David Erwin f55e4ef895 Merge pull request #753 from coralproject/adapt-embed-classnames
Adapt Class Names
2017-07-11 14:20:53 -04:00
Kim Gardner bbf1da88e6 Merge branch 'master' into adapt-embed-classnames 2017-07-11 13:51:18 -04:00
Kim Gardner d688f70c19 Merge pull request #755 from coralproject/docs-qf-register-link
Fix 404
2017-07-11 13:47:11 -04:00
Kim Gardner b04a477f6a Merge branch 'master' into adapt-embed-classnames 2017-07-11 13:44:51 -04:00
Kim Gardner 0546f741a5 Bump version to 2.4.0 2017-07-11 13:43:12 -04:00
David Erwin a535baeb31 Merge branch 'master' into docs-qf-register-link 2017-07-11 13:41:56 -04:00