Merge branch 'cb4ds-1.21.6'

cb4ds · Nov 15, 2018 · 83e4fd2 · 83e4fd2
2 parents 4e0142f + 9e087a0
commit 83e4fd2
Show file tree

Hide file tree

Showing 118 changed files with 2,025 additions and 2,729 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,3 +1,4 @@
+^CRAN-RELEASE$
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^\.travis.yml$

diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 .Ruserdata
 **/.DS_Store
 vignettes/*.html
+**/Rplots.pdf
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: canvasXpress
-Version: 1.20.5
+Version: 1.21.6
 Title: Visualization Package for CanvasXpress in R
 Description: Enables creation of visualizations using the CanvasXpress framework
     in R. CanvasXpress is a standalone JavaScript library for reproducible research
@@ -9,6 +9,7 @@ Description: Enables creation of visualizations using the CanvasXpress framework
 Type: Package
 License: GPL-3
 Encoding: UTF-8
+Language: en-US
 Authors@R: c(
     person("Isaac", "Neuhaus", email = "imnphd@gmail.com", role = c("aut")),
     person("Connie", "Brett", email = "connie@aggregate-genius.com", role = c("aut", "cre")))
@@ -21,13 +22,15 @@ Depends:
 Imports:
     htmlwidgets (>= 0.8),
     httr
-RoxygenNote: 6.0.1
+RoxygenNote: 6.1.1
 Suggests:
     shiny (>= 0.13.2),
     knitr,
     rmarkdown,
     dplyr,
     testthat,
+    webshot,
+    png,
     limma,
     grDevices,
     covr,

diff --git a/NEWS.md b/NEWS.md
@@ -5,6 +5,9 @@ information on changes to the stand-alone JavaScript CanvasXpress library see th
 <a href="http://canvasxpress.org"> main website</a>.
 
 ---
+## v1.21.6
+* Updated CanvasXpress JavaScript and CSS libraries to v21.6
+
 ## v1.20.5
 * Updated CanvasXpress JavaScript and CSS libraries to v20.5
 * Tests updated and expanded to match new CX functionality
@@ -18,9 +21,6 @@ information on changes to the stand-alone JavaScript CanvasXpress library see th
 ## v1.18.8
 * Updated CanvasXpress JavaScript and CSS libraries to v18.8
 
-## v1.18.8
-* Updated CanvasXpress JavaScript and CSS libraries to v18.8
-
 ## v1.18.5
 * Updated CanvasXpress JavaScript and CSS libraries to v18.5
 

diff --git a/R/canvasXpress.R b/R/canvasXpress.R
diff --git a/R/internal_functionality.R b/R/internal_functionality.R
diff --git a/canvasXpress.Rproj b/canvasXpress.Rproj
@@ -13,6 +13,7 @@ RnwWeave: knitr
 LaTeX: pdfLaTeX
 
 AutoAppendNewline: Yes
+StripTrailingWhitespace: Yes
 
 BuildType: Package
 PackageUseDevtools: Yes

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,19 +1,24 @@
 ## Comments from Maintainer
 
-Updated CanvasXpress JS libraries to 20.5
+Updated CanvasXpress JS libraries to 21.6
 
 ---  
 
 ## Test environments
 
 * ubuntu 16.04, R 3.3.3
-* ubuntu 16.04, R 3.4.3
+* ubuntu 16.04, R 3.4.4
 * ubuntu 16.04, R 3.5.1
 
 * ubuntu 14.04.5 (on travis-ci), R 3.4.4
-* ubuntu 14.04.5 (on travis-ci), R 3.5.0
+* ubuntu 14.04.5 (on travis-ci), R 3.5.1
 
-* win-builder (devel and release)
+* win-builder (oldrelease, release, devel)
+
+* r-hub
+* * Windows Server 2008 R2 SP1
+* * Ubuntu Linux 16.04 LTS
+* * Fedora Linux
 
 ---  
 

diff --git a/inst/doc/additional_examples.R b/inst/doc/additional_examples.R
diff --git a/inst/doc/additional_examples.Rmd b/inst/doc/additional_examples.Rmd