summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2019-07-23 16:23:34 -0400
committerPliable Pixels <pliablepixels@gmail.com>2019-07-23 16:23:34 -0400
commitaa0674f98b8cba1867f9ce2ca9e26a6d748f2c4a (patch)
treed44f9822d7cbb38ed033545ee2a86a4a597d632e
parent1ee6538a7dd3eb3adb7cb4c4ce7d389f9e1990c5 (diff)
xcode updates
-rw-r--r--config.xml2
-rw-r--r--package.json4
-rw-r--r--resources/ios/icon/icon-1024.pngbin32775 -> 32775 bytes
-rw-r--r--resources/ios/icon/icon-40.pngbin1526 -> 1526 bytes
-rw-r--r--resources/ios/icon/icon-40@2x.pngbin3486 -> 3486 bytes
-rw-r--r--resources/ios/icon/icon-40@3x.pngbin5265 -> 5265 bytes
-rw-r--r--resources/ios/icon/icon-50.pngbin2181 -> 2181 bytes
-rw-r--r--resources/ios/icon/icon-50@2x.pngbin4386 -> 4386 bytes
-rw-r--r--resources/ios/icon/icon-60.pngbin2647 -> 2647 bytes
-rw-r--r--resources/ios/icon/icon-60@2x.pngbin5265 -> 5265 bytes
-rw-r--r--resources/ios/icon/icon-60@3x.pngbin7814 -> 7814 bytes
-rw-r--r--resources/ios/icon/icon-72.pngbin3161 -> 3161 bytes
-rw-r--r--resources/ios/icon/icon-72@2x.pngbin6195 -> 6195 bytes
-rw-r--r--resources/ios/icon/icon-76.pngbin3352 -> 3352 bytes
-rw-r--r--resources/ios/icon/icon-76@2x.pngbin6643 -> 6643 bytes
-rw-r--r--resources/ios/icon/icon-83.5@2x.pngbin7168 -> 7168 bytes
-rw-r--r--resources/ios/icon/icon-small.pngbin1205 -> 1205 bytes
-rw-r--r--resources/ios/icon/icon-small@2x.pngbin2520 -> 2520 bytes
-rw-r--r--resources/ios/icon/icon-small@3x.pngbin3803 -> 3803 bytes
-rw-r--r--resources/ios/icon/icon.pngbin2451 -> 2451 bytes
-rw-r--r--resources/ios/icon/icon@2x.pngbin4988 -> 4988 bytes
-rw-r--r--resources/ios/splash/Default-568h@2x~iphone.pngbin26982 -> 26982 bytes
-rw-r--r--resources/ios/splash/Default-667h.pngbin32395 -> 32395 bytes
-rw-r--r--resources/ios/splash/Default-736h.pngbin62886 -> 62886 bytes
-rw-r--r--resources/ios/splash/Default-Landscape-736h.pngbin62629 -> 62629 bytes
-rw-r--r--resources/ios/splash/Default-Landscape@2x~ipad.pngbin59305 -> 59305 bytes
-rw-r--r--resources/ios/splash/Default-Landscape@~ipadpro.pngbin87979 -> 87979 bytes
-rw-r--r--resources/ios/splash/Default-Landscape~ipad.pngbin25129 -> 25129 bytes
-rw-r--r--resources/ios/splash/Default-Portrait@2x~ipad.pngbin59374 -> 59374 bytes
-rw-r--r--resources/ios/splash/Default-Portrait@~ipadpro.pngbin88671 -> 88671 bytes
-rw-r--r--resources/ios/splash/Default-Portrait~ipad.pngbin25496 -> 25496 bytes
-rw-r--r--resources/ios/splash/Default@2x~iphone.pngbin22993 -> 22993 bytes
-rw-r--r--resources/ios/splash/Default@2x~universal~anyany.pngbin97293 -> 97293 bytes
-rw-r--r--resources/ios/splash/Default~iphone.pngbin10366 -> 10366 bytes
-rw-r--r--www/js/EventModalCtrl.js2
-rw-r--r--www/js/MontageCtrl.js2
-rw-r--r--www/js/NVR.js2
37 files changed, 6 insertions, 6 deletions
diff --git a/config.xml b/config.xml
index 81ce3a1f..6a353d10 100644
--- a/config.xml
+++ b/config.xml
@@ -177,5 +177,5 @@
</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" />
+ <engine name="ios" spec="4.5.5" />
</widget>
diff --git a/package.json b/package.json
index 26812d3f..86b78d8e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "zmninjapro",
"description": "Home security mobile app for ZoneMinder",
- "version":"1.3.069",
+ "version":"1.3.070",
"displayName": "zmNinja",
"author": "Pliable Pixels",
"license": "custom see LICENSE.md",
@@ -66,7 +66,7 @@
"clivas": "^0.2.0",
"cordova-android": "7.1.4",
"cordova-custom-config": "^5.1.0",
- "cordova-ios": "5.0.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": "git+https://github.com/silkimen/cordova-plugin-advanced-http.git",
diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png
index fe217dd0..81d65cbc 100644
--- a/resources/ios/icon/icon-1024.png
+++ b/resources/ios/icon/icon-1024.png
Binary files differ
diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png
index 465c20db..1dc813d4 100644
--- a/resources/ios/icon/icon-40.png
+++ b/resources/ios/icon/icon-40.png
Binary files differ
diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png
index 82626bdc..09da6d1b 100644
--- a/resources/ios/icon/icon-40@2x.png
+++ b/resources/ios/icon/icon-40@2x.png
Binary files differ
diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png
index 37e01f31..8f655e97 100644
--- a/resources/ios/icon/icon-40@3x.png
+++ b/resources/ios/icon/icon-40@3x.png
Binary files differ
diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png
index 2ea385ec..63efff83 100644
--- a/resources/ios/icon/icon-50.png
+++ b/resources/ios/icon/icon-50.png
Binary files differ
diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png
index 10c25468..42339548 100644
--- a/resources/ios/icon/icon-50@2x.png
+++ b/resources/ios/icon/icon-50@2x.png
Binary files differ
diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png
index 892523e0..5497b190 100644
--- a/resources/ios/icon/icon-60.png
+++ b/resources/ios/icon/icon-60.png
Binary files differ
diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png
index 9d9b28ad..6b50264a 100644
--- a/resources/ios/icon/icon-60@2x.png
+++ b/resources/ios/icon/icon-60@2x.png
Binary files differ
diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png
index a73c946d..a5026c37 100644
--- a/resources/ios/icon/icon-60@3x.png
+++ b/resources/ios/icon/icon-60@3x.png
Binary files differ
diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png
index 1d79628d..86cbedce 100644
--- a/resources/ios/icon/icon-72.png
+++ b/resources/ios/icon/icon-72.png
Binary files differ
diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png
index 488df5d8..7620493e 100644
--- a/resources/ios/icon/icon-72@2x.png
+++ b/resources/ios/icon/icon-72@2x.png
Binary files differ
diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png
index 6843b174..b77b4e74 100644
--- a/resources/ios/icon/icon-76.png
+++ b/resources/ios/icon/icon-76.png
Binary files differ
diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png
index 9d59fa4d..c995cb4f 100644
--- a/resources/ios/icon/icon-76@2x.png
+++ b/resources/ios/icon/icon-76@2x.png
Binary files differ
diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png
index 95a378bd..e2d09ab0 100644
--- a/resources/ios/icon/icon-83.5@2x.png
+++ b/resources/ios/icon/icon-83.5@2x.png
Binary files differ
diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png
index 53ee03ad..0b0c095a 100644
--- a/resources/ios/icon/icon-small.png
+++ b/resources/ios/icon/icon-small.png
Binary files differ
diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png
index 46cc45fd..2872ca7d 100644
--- a/resources/ios/icon/icon-small@2x.png
+++ b/resources/ios/icon/icon-small@2x.png
Binary files differ
diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png
index 2e95b690..13985549 100644
--- a/resources/ios/icon/icon-small@3x.png
+++ b/resources/ios/icon/icon-small@3x.png
Binary files differ
diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png
index 56dcbd72..39162d86 100644
--- a/resources/ios/icon/icon.png
+++ b/resources/ios/icon/icon.png
Binary files differ
diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png
index 71ba66f6..b0442fb1 100644
--- a/resources/ios/icon/icon@2x.png
+++ b/resources/ios/icon/icon@2x.png
Binary files differ
diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png
index bb2ed119..9495e073 100644
--- a/resources/ios/splash/Default-568h@2x~iphone.png
+++ b/resources/ios/splash/Default-568h@2x~iphone.png
Binary files differ
diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png
index 3bb9199e..208d0d0d 100644
--- a/resources/ios/splash/Default-667h.png
+++ b/resources/ios/splash/Default-667h.png
Binary files differ
diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png
index 379197d5..421c0935 100644
--- a/resources/ios/splash/Default-736h.png
+++ b/resources/ios/splash/Default-736h.png
Binary files differ
diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png
index 0632c94d..a55947ab 100644
--- a/resources/ios/splash/Default-Landscape-736h.png
+++ b/resources/ios/splash/Default-Landscape-736h.png
Binary files differ
diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png
index bffc1b5a..3c92b910 100644
--- a/resources/ios/splash/Default-Landscape@2x~ipad.png
+++ b/resources/ios/splash/Default-Landscape@2x~ipad.png
Binary files differ
diff --git a/resources/ios/splash/Default-Landscape@~ipadpro.png b/resources/ios/splash/Default-Landscape@~ipadpro.png
index 4fd1dfe8..f0bf2cdc 100644
--- a/resources/ios/splash/Default-Landscape@~ipadpro.png
+++ b/resources/ios/splash/Default-Landscape@~ipadpro.png
Binary files differ
diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png
index e423a804..a262edbf 100644
--- a/resources/ios/splash/Default-Landscape~ipad.png
+++ b/resources/ios/splash/Default-Landscape~ipad.png
Binary files differ
diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png
index 16b9f7b8..9da6cad8 100644
--- a/resources/ios/splash/Default-Portrait@2x~ipad.png
+++ b/resources/ios/splash/Default-Portrait@2x~ipad.png
Binary files differ
diff --git a/resources/ios/splash/Default-Portrait@~ipadpro.png b/resources/ios/splash/Default-Portrait@~ipadpro.png
index 80aaa724..d67749d5 100644
--- a/resources/ios/splash/Default-Portrait@~ipadpro.png
+++ b/resources/ios/splash/Default-Portrait@~ipadpro.png
Binary files differ
diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png
index 0e038183..c473c458 100644
--- a/resources/ios/splash/Default-Portrait~ipad.png
+++ b/resources/ios/splash/Default-Portrait~ipad.png
Binary files differ
diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png
index 4c1c644b..eb00b061 100644
--- a/resources/ios/splash/Default@2x~iphone.png
+++ b/resources/ios/splash/Default@2x~iphone.png
Binary files differ
diff --git a/resources/ios/splash/Default@2x~universal~anyany.png b/resources/ios/splash/Default@2x~universal~anyany.png
index 64a45bbd..7349ebf1 100644
--- a/resources/ios/splash/Default@2x~universal~anyany.png
+++ b/resources/ios/splash/Default@2x~universal~anyany.png
Binary files differ
diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png
index 8a9138bb..70aa7c7e 100644
--- a/resources/ios/splash/Default~iphone.png
+++ b/resources/ios/splash/Default~iphone.png
Binary files differ
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 889e9a0b..852c3dc7 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -27,7 +27,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
//var isGlobalFid = false; // true if its set to MaxScoreFrameId in events
var eventId = 0;
var isSnapShotEnabled = false;
- var playState = 'play'
+ var playState = 'play';
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index c350df78..6292bae9 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -2034,7 +2034,7 @@ angular.module('zmApp.controllers')
"&monitor=" + monitor.Monitor.Id +
"&scale=" + $scope.LoginData.montageQuality +
"&rand=" + randToAvoidCacheMem + monitor.Monitor.Id +
- "&buffer=1000"
+ "&buffer=1000";
if (fps) {
stream +='&maxfps='+fps;
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 947d0bbc..28768a73 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -21,7 +21,7 @@ angular.module('zmApp.controllers')
DO NOT TOUCH zmAppVersion
It is changed by sync_version.sh
*/
- var zmAppVersion = "1.3.069";
+ var zmAppVersion = "1.3.070";
var isBackground = false;
var justResumed = false;
var timeSinceResumed = -1;