Merge branch 'dev'

gluc · Oct 24, 2015 · d36078f · d36078f
2 parents 8955b0e + 90cba9e
commit d36078f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: data.tree
 Type: Package
 Title: General Purpose Hierarchical Data Structure
-Version: 0.2.3
-Date: 2015-10-23
+Version: 0.2.4
+Date: 2015-10-24
 Author: Christoph Glur
 Maintainer: Christoph Glur <christoph.glur@ipub.com>
 VignetteBuilder: knitr

diff --git a/NEWS b/NEWS
@@ -1,11 +1,17 @@
 # All changes to data.tree are documented here.
 
+## Version 0.2.4
+- FIX: applications vignette, changed from http://htmlwidgets.org to http://www.htmlwidgets.org, as requested by CRAN
+
+## Version 0.2.3
+- FIX #33: applications vignette doesn't build because of DiagrammeR update
+- FIX #32: Cannot subclass Node
+- FIX #30: strange errors when using data.tree multiple times
 
 ## Version 0.2.2
 - FIX: Get can now fetch vectors and matrices too
 - ADD: Node$siblings
 
-
 ## Version 0.2.0-rc.1 Elder
 
 - ADD: ClimbByAttribute

diff --git a/vignettes/applications.Rmd b/vignettes/applications.Rmd
@@ -633,7 +633,7 @@ nodelabels("   ", GetPhyloNr(jl, "node"), frame = "rect")
 # Bubble Chart (visualisation)
 
 In this example, we will replicate Mike Bostock's bubble example. See here for details: http://bl.ocks.org/mbostock/4063269.  
-We use Joe Cheng's [bubbles](https://github.com/jcheng5/bubbles) package. All of this is inspired by [Timelyportfolio](https://github.com/timelyportfolio), the king of [htmlwidgets](http://htmlwidgets.org).
+We use Joe Cheng's [bubbles](https://github.com/jcheng5/bubbles) package. All of this is inspired by [Timelyportfolio](https://github.com/timelyportfolio), the king of [htmlwidgets](http://www.htmlwidgets.org).
 
 You'll learn how to convert a complex JSON into a data.frame, and how to use this to plot hierarchic visualisations.