update from fork3

jasdumas · Sep 11, 2016 · 752035e · 752035e
1 parent f4915d5
commit 752035e
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 9 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.RData b/.RData
diff --git a/.Rhistory b/.Rhistory
@@ -250,3 +250,31 @@ runApp()
 install.packages(c("devtools", "plotly", "R.utils", "sp", "swirl", "testthat"))
 session_info()
 rsconnect::deployApp(appFileManifest = "manifest.txt")
+shiny::runApp()
+runApp()
+runApp()
+runApp()
+runApp()
+runApp()
+runApp()
+shiny::runApp()
+runApp(appFileManifest="manifest.txt")
+runApp()
+library(shinydashboard)
+runApp()
+runApp()
+runApp()
+shiny::runApp()
+shiny::runApp()
+shiny::runApp()
+runApp()
+runApp()
+runApp()
+library(shiny)
+runApp()
+runApp()
+runApp()
+library(shiny)
+runApp()
+library(shinydashboard)
+runApp()
diff --git a/.Rproj.user/E833DC/pcs/source-pane.pper b/.Rproj.user/E833DC/pcs/source-pane.pper
@@ -1,3 +1,3 @@
 {
-    "activeTab" : 0
+    "activeTab" : -1
 }
diff --git a/.Rproj.user/E833DC/pcs/windowlayoutstate.pper b/.Rproj.user/E833DC/pcs/windowlayoutstate.pper
@@ -1,14 +1,14 @@
 {
     "left" : {
-        "panelheight" : 613,
-        "splitterpos" : 208,
-        "topwindowstate" : "NORMAL",
-        "windowheight" : 651
+        "panelheight" : 648,
+        "splitterpos" : 172,
+        "topwindowstate" : "HIDE",
+        "windowheight" : 686
     },
     "right" : {
-        "panelheight" : 613,
-        "splitterpos" : 388,
+        "panelheight" : 648,
+        "splitterpos" : 410,
         "topwindowstate" : "NORMAL",
-        "windowheight" : 651
+        "windowheight" : 686
     }
 }
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,9 @@ DESCRIPTION
 LICENSE.txt
 
 README.md
+
+*.pdf
+
+*.pptx
+
+*.png
diff --git a/misc/.DS_Store b/misc/.DS_Store
diff --git a/ui.R b/ui.R
@@ -2,7 +2,7 @@
 library(shinyAce)
 library(RCurl)
 library(shinyBS)
-#library("shinydashboard")
+library("shinydashboard")
 require('shinydashboard')
 
 source("misc/html.R")

diff --git a/www/.DS_Store b/www/.DS_Store
diff --git a/www/AdminLTE/.DS_Store b/www/AdminLTE/.DS_Store