Merge branch 'dev'

cncjs · Dec 9, 2015 · cefd95b · cefd95b
2 parents 4537998 + 563422d
commit cefd95b
Show file tree

Hide file tree

Showing 925 changed files with 114,198 additions and 384,083 deletions.
diff --git a/app/views/index.hbs b/app/views/index.hbs
@@ -17,15 +17,11 @@
 <!--[if lt IE 9]>
 <script src="{{webroot}}vendor/html5shiv/dist/html5shiv.js"></script>
 <![endif]-->
-<script src="{{webroot}}vendor/modernizr/modernizr.js"></script>
 <script src="/socket.io/socket.io.js"></script>
 </head>
 <body class="{{dir}}">
 <div id="loading">{{> loading}}</div>
 <div id="components"></div>
-<!--[if lt IE 8]>
-<script type="text/javascript" src="{{webroot}}vendor/json2/json2.js"></script>
-<![endif]-->
 <script data-version="{{version}}" data-webroot="{{webroot}}" data-cdn="{{webroot}}" src="{{webroot}}plugins.js"></script>
 <script src="{{webroot}}assets/vendor.js"></script>
 <script src="{{webroot}}assets/app.js"></script>

diff --git a/bower.json b/bower.json
@@ -1,39 +1,11 @@
 {
   "name": "cncjs",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "CNC.js is a web-based CNC milling controller for the Arduino running GRBL",
   "dependencies": {
-    "Sortable": "~1.2.1",
-    "async": "~1.4.2",
-    "bootstrap": "~3.3.5",
     "html5shiv": "~3.7.3",
     "i18next": "~1.10.2",
-    "jsUri": "~1.3.1",
-    "json2": "*",
-    "modernizr": "~2.8.3",
-    "normalize-css": "3.0.x",
-    "rxjs": "~3.0.0",
+    "Sortable": "~1.2.1",
     "stacktrace-js": "0.6.x"
-  },
-  "overrides": {
-    "bootstrap": {
-      "main": [
-        "dist/**"
-      ]
-    },
-    "json2": {
-      "main": "json2.js"
-    },
-    "modernizr": {
-      "main": "modernizr.js"
-    },
-    "rxjs": {
-      "main": [
-        "dist/rx.js",
-        "dist/rx.*.js",
-        "dist/rx.*.map"
-      ]
-    }
-  },
-  "license": "MIT"
+  }
 }
diff --git a/bower_components/async/.bower.json b/bower_components/async/.bower.json
diff --git a/bower_components/async/CHANGELOG.md b/bower_components/async/CHANGELOG.md
diff --git a/bower_components/async/LICENSE b/bower_components/async/LICENSE
diff --git a/bower_components/async/Makefile b/bower_components/async/Makefile