From 0e384ba204b4793b30dba2ab8ea13e020d0f5ef7 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 9 Aug 2017 11:09:20 -0300 Subject: [PATCH 1/3] Update ionic and lodash for dev-dependencies --- app-template/package-template.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-template/package-template.json b/app-template/package-template.json index d9ebdd18a..de069c328 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -118,9 +118,9 @@ "devDependencies": { "cordova": "^6.3.1", "grunt": "^1.0.1", - "ionic": "^2.1.0", + "ionic": "^3.6.0", "trash-cli": "^1.4.0", - "lodash": "^4.3.0", + "lodash": "^4.17.4", "pre-commit": "^1.1.3" }, "pre-commit": "unstage-package" From d6b77943994bb8d31401920f6e2dd0ed10ea0f52 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 9 Aug 2017 11:34:26 -0300 Subject: [PATCH 2/3] Fix bower dependencies --- bower.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index 1547d384f..ed4b40ce9 100644 --- a/bower.json +++ b/bower.json @@ -15,12 +15,12 @@ "moment": "2.10.3", "ng-lodash": "0.2.3", "qrcode-decoder-js": "*", - "trezor-connect": "~1.1.3", + "trezor-connect": "https://github.com/trezor/connect.git#c1a00f9f0f4a13239ba13ddd589c6ca61f2e7876", "ng-csv": "~0.3.6", - "ionic-toast": "^0.4.1", - "angular-clipboard": "^1.4.2", - "angular-md5": "^0.1.10", - "ngtouch": "^1.0.1" + "ionic-toast": "0.4.1", + "angular-clipboard": "1.4.2", + "angular-md5": "0.1.10", + "ngtouch": "1.0.1" }, "resolutions": { "angular": "1.5.3", From 179ffe0856146206c149be937d1c75c1725e282f Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 9 Aug 2017 11:46:21 -0300 Subject: [PATCH 3/3] Trezo-connect --- bower.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index ed4b40ce9..08a82d9b8 100644 --- a/bower.json +++ b/bower.json @@ -17,10 +17,10 @@ "qrcode-decoder-js": "*", "trezor-connect": "https://github.com/trezor/connect.git#c1a00f9f0f4a13239ba13ddd589c6ca61f2e7876", "ng-csv": "~0.3.6", - "ionic-toast": "0.4.1", - "angular-clipboard": "1.4.2", - "angular-md5": "0.1.10", - "ngtouch": "1.0.1" + "ionic-toast": "^0.4.1", + "angular-clipboard": "^1.4.2", + "angular-md5": "^0.1.10", + "ngtouch": "^1.0.1" }, "resolutions": { "angular": "1.5.3",