Commit Graph

7162 Commits

Author SHA1 Message Date
Kim Gardner ad669b8399 Merge branch 'master' into featured-comments 2017-07-19 16:28:20 -04:00
Kim Gardner 1c8e009366 Merge pull request #777 from coralproject/perma-link-plugin-commentId
Replace deprecated commentId in talk-plugin-permalink
2017-07-19 16:27:59 -04:00
Chi Vinh Le 5d8528fdb5 Replace deprecated commentId 2017-07-20 03:16:05 +07:00
Kim Gardner 6cab2634bf Add space before Go to conversation text 2017-07-19 16:05:28 -04:00
Chi Vinh Le d6adff288c Fix typo 2017-07-20 02:51:09 +07:00
Chi Vinh Le ad4b03bfcd Merge branch 'master' into featured-comments 2017-07-20 02:39:29 +07:00
Kim Gardner 99b8b4e90b Bump version 2.5.0 2017-07-19 15:34:04 -04:00
Chi Vinh Le 3fa475009a Use getDefinition name from plugin-api 2017-07-20 02:32:17 +07:00
Kim Gardner 139802381f Merge pull request #775 from coralproject/recursively-resolve-fragments
Recursively resolve fragments
2017-07-19 15:29:06 -04:00
Chi Vinh Le fd0143da5d Use connect from framework 2017-07-20 02:17:31 +07:00
Chi Vinh Le baa4808364 Allow setting default stream tab 2017-07-20 02:16:19 +07:00
Kim Gardner 0a4000328b Merge branch 'master' into next 2017-07-19 15:15:02 -04:00
Chi Vinh Le 673f0cd232 Hide featured comments tab when empty 2017-07-20 02:07:40 +07:00
Kim Gardner fa02d44270 Merge branch 'master' into recursively-resolve-fragments 2017-07-19 14:32:02 -04:00
Chi Vinh Le 84edd8c6c2 Merge branch 'master' into featured-comments
Conflicts:
	client/coral-embed-stream/src/components/Stream.js
2017-07-20 01:30:22 +07:00
Chi Vinh Le da2bc69d19 Translation 2017-07-20 01:27:06 +07:00
Chi Vinh Le b769e95898 Implement pagination 2017-07-20 01:19:45 +07: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 7005175fc0 Simplify file namings 2017-07-19 23:55:35 +07:00
Chi Vinh Le 8f64229dee Implement FeaturedComment container 2017-07-19 23:50:39 +07:00
Chi Vinh Le 47a5b84a74 Pass correct slot props 2017-07-19 23:37:35 +07:00
Chi Vinh Le cc1026233f Merge branch 'recursively-resolve-fragments' into featured-comments 2017-07-19 23:32:04 +07:00
Chi Vinh Le 6f1b0b55ec Merge branch 'master' into featured-comments 2017-07-19 23:31:54 +07:00
Chi Vinh Le dcdfbb691a Use lazy loading for slot fragments 2017-07-19 23:30:51 +07: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 4511b9ca57 Merge branch 'resolve-slot-fragments-lazy' into featured-comments
Conflicts:
	client/coral-embed-stream/src/containers/Stream.js
	client/coral-framework/utils/index.js
	plugin-api/beta/client/utils/index.js
2017-07-19 21:15:35 +07: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
Chi Vinh Le f051ee1d58 Don't create callback in render 2017-07-19 00:48:33 +07:00
Chi Vinh Le cd1735e1d6 Merge branch 'featured-comments' of ssh://github.com/coralproject/talk into featured-comments 2017-07-19 00:34:12 +07:00
Chi Vinh Le 3b10aa3945 Implement 'Go to conversation' 2017-07-19 00:33:01 +07:00
Kim Gardner 3b0b6bd73c Merge branch 'master' into featured-comments 2017-07-18 12:03:12 -04:00
Chi Vinh Le 760d078705 Embed scroll to correct element 2017-07-18 23:00:12 +07:00
Chi Vinh Le 46473142ba Use generic version of addTag, removeTag in framework 2017-07-18 21:23:39 +07:00
Chi Vinh Le 8a619a219f Refactor isFeatured / isTagged 2017-07-18 21:10:59 +07:00
Kim Gardner 73d15f34d7 Merge branch 'master' into excludeIf-api 2017-07-18 10:10:20 -04:00
Chi Vinh Le cf56ca8263 Merge branch 'featured-comments' of ssh://github.com/coralproject/talk into featured-comments 2017-07-18 21:07:09 +07:00
Kim Gardner add1b67a61 Merge branch 'master' into next 2017-07-18 10:06:02 -04:00
Kim Gardner 1183550e14 Merge pull request #768 from coralproject/docs-microservices
Write microservice docs
2017-07-18 10:05:37 -04:00
Chi Vinh Le 6652368221 Don't export internals of embed stream in plugin-api (for now) 2017-07-18 21:04:30 +07:00
Kim Gardner 9cbcb902c5 Merge branch 'master' into next 2017-07-18 10:00:27 -04:00
Kim Gardner d488e168c4 Merge branch 'master' into featured-comments 2017-07-18 09:59:49 -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
Chi Vinh Le 19929c97d8 Fix layout issues in comment 2017-07-18 20:17:01 +07:00
Chi Vinh Le 99fc67d0d9 Rename insertSorted to insertCommentSorted 2017-07-18 19:38:52 +07:00
Chi Vinh Le 636d1f4788 Use withFragments from plugin-api 2017-07-18 19:37:30 +07:00