Merge pull request #393 from emoncms/development

You are right, It was time to merge it!!
emoncms · Jul 17, 2018 · 83204eb · 83204eb
2 parents 092cf02 + fb69ad1
commit 83204eb
Show file tree

Hide file tree

Showing 273 changed files with 3,503 additions and 44,187 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,5 @@
-/settings.php
-emoncms.log
-Modules/input
-Modules/feed
-Modules/dashboard
-Modules/vis
-Modules/assessment/views/ccreport.html
-Modules/assessment/views/ccreport.js
-Modules/assessment/.sass-cache
-background.jpg
-/nbproject
-.DS_Store
-nbproject/
-Modules/assessment/images
+.sass-cache
+
+reports/*/
+images/*
+images/*/
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "Modules/assessment/js/canvas-barchart"]
-	path = Modules/assessment/js/canvas-barchart
-	url = https://github.com/EMT/canvas-barchart.git
+[submodule "js/openFUVC"]
+	path = js/openFUVC
+	url = https://github.com/carboncoop/openFUVC.git
diff --git a/.htaccess b/.htaccess
diff --git a/.jshintrc b/.jshintrc
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt