merge

[xtuple] / package.json

diff --git a/package.json b/package.json
index 2ec662d..cf61b68 100644 (file)
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "less": "1.5.0",
     "moment": "2.4.x",
     "nodemailer": "0.3.x",
-    "npm":"1.2.30",
+    "npm":"1.4.x",
     "node-forge": "0.6.x",
     "oauth2orize": "0.1.x",
     "oauth2orize-jwt-bearer": "0.1.x",
@@ -36,6 +36,7 @@
     "passport-oauth2-jwt-bearer": "0.1.x",
     "paynode": "0.3.6",
     "pg": "0.14.x",
+    "qr-image": "1.1.x",
     "request": "2.14.x",
     "rimraf": "2.2.x",
     "rjson": "~0.2.4",
@@ -43,14 +44,16 @@
     "underscore": "1.4.x",
     "winston": "0.7.x",
     "underscore.string": "~2.3.3",
-    "ursa": "0.8.x",
+    "xtuple-linguist": "0.1.x",
     "jquery": "~2.1.1"
   },
   "devDependencies": {
     "chai": "1.5.x",
     "mocha": "1.9.x",
     "html5": "0.3.13",
+    "jshint": "2.4.x",
     "zombie": "1.4.x",
+    "nodemon": "~1.0.15",
     "csslint": "~0.10.0"
   },
   "optionalDependencies": {
@@ -58,7 +61,7 @@
     "googleapis": "~0.4.6"
   },
   "engines": {
-    "node": "0.8.x"
+    "node": "^0.10"
   },
   "main": "node-datasource/main.js",
   "scripts": {