From 2dcd736caf0cfd3fc4ff0a2841d486c795d6661d Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 23 Sep 2018 14:17:04 -0400 Subject: wekwebview fixes --- package.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index ecf8fb61..49e0a048 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "license": "custom see LICENSE.md", "cordova": { "platforms": [ - "android", - "ios" + "ios", + "android" ], "plugins": { "cordova-plugin-add-swift-support": {}, @@ -46,20 +46,22 @@ "cordova-library-helper-pp-fork": {}, "cordova-plugin-multi-window": {}, "cordova-plugin-ignore-lint-translation": {}, - "cordova-plugin-ionic-keyboard": {}, "cordova-plugin-cloud-settings": { "ANDROID_BACKUP_SERVICE_KEY": "AEdPqrEAAAAIqF-OaHdwIzZhx2L1WOfAGTagBxm5a1R4wBW_Uw" }, "phonegap-plugin-push": { "FCM_VERSION": "11.6.2" }, + "cordova-plugin-ionic-keyboard": {}, + "cordova-plugin-ionic-webview": { + "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" + }, "cordova-plugin-certificates": {} } }, "dependencies": { "clivas": "^0.2.0", "com.telerik.plugins.nativepagetransitions": "^0.6.5", - "cordova-android": "^6.3.0", "cordova-ios": "~4.5.5", "cordova-library-helper-pp-fork": "^1.0.1", "cordova-plugin-add-swift-support": "^1.7.2", @@ -79,6 +81,7 @@ "cordova-plugin-inappbrowser": "^1.7.1", "cordova-plugin-insomnia": "^4.3.0", "cordova-plugin-ionic-keyboard": "^2.1.2", + "cordova-plugin-ionic-webview": "^2.1.4", "cordova-plugin-media-pp-fork": "^1.0.2-dev", "cordova-plugin-multi-window": "0.0.3", "cordova-plugin-network-information": "^2.0.1", @@ -99,7 +102,8 @@ "minimist": "^1.2.0", "mkdirp": "^0.5.1", "phonegap-plugin-mobile-accessibility": "^1.0.5", - "phonegap-plugin-push": "^2.1.3" + "phonegap-plugin-push": "^2.1.3", + "cordova-android": "~6.4.0" }, "devDependencies": { "bower": "^1.8.4", -- cgit v1.2.3 From 60ec86f19b1e6003851df5ed33dc60cdf1d23a3a Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 24 Sep 2018 15:32:52 -0400 Subject: #709 currently remove wkwebview before building android --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 49e0a048..54516d81 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,6 @@ "cordova-plugin-globalization": {}, "cordova-plugin-inappbrowser": {}, "cordova-plugin-insomnia": {}, - "cordova-plugin-photo-library": { - "PHOTO_LIBRARY_USAGE_DESCRIPTION": "images to gallery" - }, "cordova-plugin-pin-dialog": {}, "cordova-plugin-settings-hook": {}, "cordova-plugin-splashscreen": {}, @@ -53,6 +50,9 @@ "FCM_VERSION": "11.6.2" }, "cordova-plugin-ionic-keyboard": {}, + "cordova-plugin-photo-library": { + "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save image alarms todisk" + }, "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" }, @@ -62,6 +62,7 @@ "dependencies": { "clivas": "^0.2.0", "com.telerik.plugins.nativepagetransitions": "^0.6.5", + "cordova-android": "^6.4.0", "cordova-ios": "~4.5.5", "cordova-library-helper-pp-fork": "^1.0.1", "cordova-plugin-add-swift-support": "^1.7.2", @@ -85,7 +86,7 @@ "cordova-plugin-media-pp-fork": "^1.0.2-dev", "cordova-plugin-multi-window": "0.0.3", "cordova-plugin-network-information": "^2.0.1", - "cordova-plugin-photo-library": "^1.2.2", + "cordova-plugin-photo-library": "git+https://github.com/pliablepixels/cordova-plugin-photo-library.git", "cordova-plugin-pin-dialog": "^0.1.3", "cordova-plugin-settings-hook": "^0.2.7", "cordova-plugin-splashscreen": "^4.0.3", @@ -102,8 +103,7 @@ "minimist": "^1.2.0", "mkdirp": "^0.5.1", "phonegap-plugin-mobile-accessibility": "^1.0.5", - "phonegap-plugin-push": "^2.1.3", - "cordova-android": "~6.4.0" + "phonegap-plugin-push": "^2.1.3" }, "devDependencies": { "bower": "^1.8.4", -- cgit v1.2.3 From 1be879cdee22de8b373b0650d5950e0f4ee42c69 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 25 Sep 2018 11:16:41 -0400 Subject: nits #709 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 54516d81..3e96e1fd 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "license": "custom see LICENSE.md", "cordova": { "platforms": [ - "ios", - "android" + "android", + "ios" ], "plugins": { "cordova-plugin-add-swift-support": {}, @@ -63,7 +63,6 @@ "clivas": "^0.2.0", "com.telerik.plugins.nativepagetransitions": "^0.6.5", "cordova-android": "^6.4.0", - "cordova-ios": "~4.5.5", "cordova-library-helper-pp-fork": "^1.0.1", "cordova-plugin-add-swift-support": "^1.7.2", "cordova-plugin-android-fingerprint-auth": "^1.4.0", @@ -103,7 +102,8 @@ "minimist": "^1.2.0", "mkdirp": "^0.5.1", "phonegap-plugin-mobile-accessibility": "^1.0.5", - "phonegap-plugin-push": "^2.1.3" + "phonegap-plugin-push": "^2.1.3", + "cordova-ios": "~4.5.5" }, "devDependencies": { "bower": "^1.8.4", -- cgit v1.2.3 From d8fea09d65e5207ef8c4fafcddd5fc74a7f7be00 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 28 Sep 2018 08:37:24 -0400 Subject: #709 implement native/XHR wrapper, convert all success/error to "then" construct --- package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3e96e1fd..cd735462 100644 --- a/package.json +++ b/package.json @@ -56,15 +56,18 @@ "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" }, - "cordova-plugin-certificates": {} + "cordova-plugin-certificates": {}, + "cordova-plugin-advanced-http": {} } }, "dependencies": { "clivas": "^0.2.0", "com.telerik.plugins.nativepagetransitions": "^0.6.5", "cordova-android": "^6.4.0", + "cordova-ios": "~4.5.5", "cordova-library-helper-pp-fork": "^1.0.1", "cordova-plugin-add-swift-support": "^1.7.2", + "cordova-plugin-advanced-http": "^2.0.1", "cordova-plugin-android-fingerprint-auth": "^1.4.0", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", @@ -102,8 +105,7 @@ "minimist": "^1.2.0", "mkdirp": "^0.5.1", "phonegap-plugin-mobile-accessibility": "^1.0.5", - "phonegap-plugin-push": "^2.1.3", - "cordova-ios": "~4.5.5" + "phonegap-plugin-push": "^2.1.3" }, "devDependencies": { "bower": "^1.8.4", -- cgit v1.2.3 From ebe04f8fc791413131c37425998be5be4a2ef538 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 28 Sep 2018 14:29:43 -0400 Subject: #709 dont escape urls in caller, incorporate cordova http ssl and basic auth checks --- package.json | 2 -- 1 file changed, 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index cd735462..891ce164 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" }, - "cordova-plugin-certificates": {}, "cordova-plugin-advanced-http": {} } }, @@ -72,7 +71,6 @@ "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", "cordova-plugin-canvas2image-pp-fork": "^0.6.0", - "cordova-plugin-certificates": "^0.6.4", "cordova-plugin-cloud-settings": "^1.0.4", "cordova-plugin-customurlscheme": "^4.3.0", "cordova-plugin-device": "^2.0.1", -- cgit v1.2.3 From 736002099098b9e044000dd02f359182c4043ef8 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 29 Sep 2018 16:47:06 -0400 Subject: certificate fixes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 891ce164..b3641d94 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.022", + "version": "1.3.026", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", -- cgit v1.2.3 From 65491396c1d258144e9e5f0a7bb6a1f41e43a079 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 2 Oct 2018 14:54:36 -0400 Subject: nits --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index b3641d94..98803b58 100644 --- a/package.json +++ b/package.json @@ -46,9 +46,6 @@ "cordova-plugin-cloud-settings": { "ANDROID_BACKUP_SERVICE_KEY": "AEdPqrEAAAAIqF-OaHdwIzZhx2L1WOfAGTagBxm5a1R4wBW_Uw" }, - "phonegap-plugin-push": { - "FCM_VERSION": "11.6.2" - }, "cordova-plugin-ionic-keyboard": {}, "cordova-plugin-photo-library": { "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save image alarms todisk" @@ -56,7 +53,10 @@ "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" }, - "cordova-plugin-advanced-http": {} + "cordova-plugin-advanced-http": {}, + "phonegap-plugin-push": { + "FCM_VERSION": "11.6.2" + } } }, "dependencies": { @@ -103,7 +103,7 @@ "minimist": "^1.2.0", "mkdirp": "^0.5.1", "phonegap-plugin-mobile-accessibility": "^1.0.5", - "phonegap-plugin-push": "^2.1.3" + "phonegap-plugin-push": "~2.1.3" }, "devDependencies": { "bower": "^1.8.4", -- cgit v1.2.3 From fec3d0ceb82da0685f239336d46ca0ba2acbafc1 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 8 Oct 2018 12:14:58 -0400 Subject: nits --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 98803b58..487fc3de 100644 --- a/package.json +++ b/package.json @@ -50,12 +50,12 @@ "cordova-plugin-photo-library": { "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save image alarms todisk" }, - "cordova-plugin-ionic-webview": { - "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" - }, "cordova-plugin-advanced-http": {}, "phonegap-plugin-push": { "FCM_VERSION": "11.6.2" + }, + "cordova-plugin-ionic-webview": { + "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" } } }, @@ -82,7 +82,7 @@ "cordova-plugin-inappbrowser": "^1.7.1", "cordova-plugin-insomnia": "^4.3.0", "cordova-plugin-ionic-keyboard": "^2.1.2", - "cordova-plugin-ionic-webview": "^2.1.4", + "cordova-plugin-ionic-webview": "git+https://github.com/pliablepixels/cordova-plugin-ionic-webview.git", "cordova-plugin-media-pp-fork": "^1.0.2-dev", "cordova-plugin-multi-window": "0.0.3", "cordova-plugin-network-information": "^2.0.1", -- cgit v1.2.3 From f6be92a7c14d600fa1345a55de76bda706b84380 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 14 Oct 2018 14:39:37 -0400 Subject: migrate websockets to native --- package.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 487fc3de..e8a2e8e3 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ ], "plugins": { "cordova-plugin-add-swift-support": {}, - "com.telerik.plugins.nativepagetransitions": {}, "cordova-plugin-android-permissions": {}, "cordova-plugin-app-version": {}, "cordova-plugin-customurlscheme": { @@ -34,9 +33,6 @@ "cordova-plugin-network-information": {}, "cordova-plugin-device": {}, "cordova-plugin-file": {}, - "cordova-plugin-canvas2image-pp-fork": { - "PHOTOLIBRARY_USAGE_DESCRIPTION": " " - }, "cordova-plugin-media-pp-fork": {}, "cordova-plugin-email": {}, "cordova-plugin-statusbar": {}, @@ -56,21 +52,21 @@ }, "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" - } + }, + "cordova-plugin-advanced-websocket": {} } }, "dependencies": { "clivas": "^0.2.0", - "com.telerik.plugins.nativepagetransitions": "^0.6.5", "cordova-android": "^6.4.0", "cordova-ios": "~4.5.5", "cordova-library-helper-pp-fork": "^1.0.1", "cordova-plugin-add-swift-support": "^1.7.2", "cordova-plugin-advanced-http": "^2.0.1", + "cordova-plugin-advanced-websocket": "^1.1.3", "cordova-plugin-android-fingerprint-auth": "^1.4.0", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", - "cordova-plugin-canvas2image-pp-fork": "^0.6.0", "cordova-plugin-cloud-settings": "^1.0.4", "cordova-plugin-customurlscheme": "^4.3.0", "cordova-plugin-device": "^2.0.1", -- cgit v1.2.3