From 232ef29cb84f937bb44582adadb9ed78abfb1d2a Mon Sep 17 00:00:00 2001 From: David Martin Date: Mon, 23 Nov 2015 16:45:36 +0000 Subject: [PATCH 1/5] Update fh-mbaas-api to use fh.cache api with jdg support --- .travis.yml | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cf74d37..ae8035d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,10 @@ node_js: - "0.10" sudo: false before_install: +<<<<<<< HEAD - npm install -g npm@2.13.5 +======= + - npm install -g npm@2.14.9 +>>>>>>> Use npm v2 for travis - npm install -g grunt-cli install: npm install diff --git a/package.json b/package.json index 11ab454..cce6ca9 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "dependencies": { "express": "4.0.0", - "fh-mbaas-api": "5.3.5", + "fh-mbaas-api": "5.6.0-201", "request": "2.34.0", "body-parser": "~1.0.2", "cors": "~2.2.0", From f33056e76b6584f32f4ccabdd707b8bd2eab6b4d Mon Sep 17 00:00:00 2001 From: Graham Hillis Date: Thu, 10 Dec 2015 14:29:40 +0000 Subject: [PATCH 2/5] Update fh-mbaas-api to version 5.7.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cce6ca9..eb5ca1d 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "dependencies": { "express": "4.0.0", - "fh-mbaas-api": "5.6.0-201", + "fh-mbaas-api": "5.7.6", "request": "2.34.0", "body-parser": "~1.0.2", "cors": "~2.2.0", From 558da726f14e3f52d13cd7625a85b2bababe3ca3 Mon Sep 17 00:00:00 2001 From: Graham Hillis Date: Fri, 18 Dec 2015 15:45:50 +0000 Subject: [PATCH 3/5] Update fh-mbaas-api for reporting fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb5ca1d..5c1d731 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "dependencies": { "express": "4.0.0", - "fh-mbaas-api": "5.7.6", + "fh-mbaas-api": "5.7.8", "request": "2.34.0", "body-parser": "~1.0.2", "cors": "~2.2.0", From ba6c0ce92009bc01d905c5f10961968f754affe1 Mon Sep 17 00:00:00 2001 From: Graham Hillis Date: Wed, 6 Jan 2016 16:05:28 +0000 Subject: [PATCH 4/5] Update fh-mbaas-api to version 5.7.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c1d731..d9fd29f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "dependencies": { "express": "4.0.0", - "fh-mbaas-api": "5.7.8", + "fh-mbaas-api": "5.7.9", "request": "2.34.0", "body-parser": "~1.0.2", "cors": "~2.2.0", From 267fa232ad4af9f08824b2741d074970f0911900 Mon Sep 17 00:00:00 2001 From: Graham Hillis Date: Thu, 7 Jan 2016 12:24:05 +0000 Subject: [PATCH 5/5] setting npm version to 2.13.5 as requested --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae8035d..cf74d37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,6 @@ node_js: - "0.10" sudo: false before_install: -<<<<<<< HEAD - npm install -g npm@2.13.5 -======= - - npm install -g npm@2.14.9 ->>>>>>> Use npm v2 for travis - npm install -g grunt-cli install: npm install