summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.xml11
-rw-r--r--package.json18
-rw-r--r--www/js/LoginCtrl.js4
-rw-r--r--www/js/NVR.js2
4 files changed, 13 insertions, 22 deletions
diff --git a/config.xml b/config.xml
index 84ca2e00..719bbc73 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.053" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.055" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>zmNinja</name>
<description>
High performance ZoneMinder client
@@ -144,7 +144,6 @@
<plugin name="cordova-plugin-insomnia" spec="^4.3.0" />
<plugin name="cordova-plugin-pin-dialog" spec="^0.1.3" />
<plugin name="cordova-plugin-splashscreen" spec="^4.1.0" />
- <plugin name="cordova-plugin-websocket" spec="^0.12.2" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
<plugin name="cordova-sqlite-storage" spec="^1.5.3" />
<plugin name="cordova-plugin-touch-id" spec="^3.4.0" />
@@ -163,7 +162,6 @@
<plugin name="cordova-plugin-photo-library" spec="git+https://github.com/pliablepixels/cordova-plugin-photo-library.git">
<variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="Save image alarms todisk" />
</plugin>
- <plugin name="cordova-plugin-advanced-websocket" spec="^1.1.4" />
<plugin name="cordova-plugin-x-socialsharing" spec="^5.4.3">
<variable name="ANDROID_SUPPORT_V4_VERSION" value="24.1.1+" />
</plugin>
@@ -172,11 +170,10 @@
<variable name="FCM_VERSION" value="11.6.2" />
</plugin>
<plugin name="cordova-custom-config" spec="5.0.2" />
- <plugin name="cordova-plugin-advanced-http" spec="https://github.com/silkimen/cordova-plugin-advanced-http.git" />
+ <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
+ <plugin name="cordova-plugin-advanced-http" spec="git+https://github.com/silkimen/cordova-plugin-advanced-http.git" />
<plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git">
<variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
</plugin>
- <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
- <engine name="android" spec="7.1.4" />
- <engine name="ios" spec="5.0.0" />
+ <plugin name="cordova-plugin-advanced-websocket" spec="1.1.5" />
</widget>
diff --git a/package.json b/package.json
index 829fe13f..d42db99b 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,12 @@
{
"name": "zmninjapro",
"description": "Home security mobile app for ZoneMinder",
- "version":"1.3.053",
+ "version": "1.3.055",
"displayName": "zmNinja",
"author": "Pliable Pixels",
"license": "custom see LICENSE.md",
"cordova": {
- "platforms": [
- "android",
- "ios"
- ],
+ "platforms": [],
"plugins": {
"cordova-plugin-add-swift-support": {},
"cordova-plugin-android-permissions": {},
@@ -26,7 +23,6 @@
"cordova-plugin-insomnia": {},
"cordova-plugin-pin-dialog": {},
"cordova-plugin-splashscreen": {},
- "cordova-plugin-websocket": {},
"cordova-plugin-whitelist": {},
"cordova-sqlite-storage": {},
"cordova-plugin-touch-id": {
@@ -48,7 +44,6 @@
"PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save image alarms todisk"
},
"cordova-plugin-advanced-http": {},
- "cordova-plugin-advanced-websocket": {},
"cordova-plugin-x-socialsharing": {
"ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
},
@@ -57,21 +52,21 @@
"FCM_VERSION": "11.6.2"
},
"cordova-custom-config": {},
+ "cordova-plugin-media-pp-fork": {},
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
},
- "cordova-plugin-media-pp-fork": {}
+ "cordova-plugin-advanced-websocket": {}
}
},
"dependencies": {
"clivas": "^0.2.0",
"cordova-android": "7.1.4",
"cordova-custom-config": "^5.0.2",
- "cordova-ios": "5.0.0",
"cordova-library-helper-pp-fork": "^1.0.1",
"cordova-plugin-add-swift-support": "^1.7.2",
"cordova-plugin-advanced-http": "git+https://github.com/silkimen/cordova-plugin-advanced-http.git",
- "cordova-plugin-advanced-websocket": "^1.1.4",
+ "cordova-plugin-advanced-websocket": "1.1.5",
"cordova-plugin-android-fingerprint-auth": "^1.5.0",
"cordova-plugin-android-permissions": "^1.0.0",
"cordova-plugin-app-version": "^0.1.9",
@@ -94,7 +89,6 @@
"cordova-plugin-splashscreen": "^4.1.0",
"cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-touch-id": "^3.4.0",
- "cordova-plugin-websocket": "^0.12.2",
"cordova-plugin-whitelist": "^1.3.3",
"cordova-plugin-x-socialsharing": "^5.4.4",
"cordova-sqlite-storage": "^1.5.3",
@@ -185,4 +179,4 @@
]
}
}
-}
+} \ No newline at end of file
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index fef2c1ce..36eac47d 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -385,7 +385,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
else {
mobilePinConfig();
}
- }
+ };
function desktopPinConfig() {
@@ -472,7 +472,7 @@ function mobilePinConfig () {
} else {
NVR.debug("Password disabled");
}
- };
+ }
//-------------------------------------------------------------------------------
// Makes input easier
diff --git a/www/js/NVR.js b/www/js/NVR.js
index b0330995..9b0e9f08 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -20,7 +20,7 @@ angular.module('zmApp.controllers')
DO NOT TOUCH zmAppVersion
It is changed by sync_version.sh
*/
- var zmAppVersion = "1.3.053";
+ var zmAppVersion = "1.3.055";
var isBackground = false;
var justResumed = false;
var timeSinceResumed = -1;