summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md27
-rw-r--r--config.xml200
2 files changed, 127 insertions, 100 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8260ebf9..f8449745 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,30 @@
# Change Log
-## [v1.2.32](https://github.com/pliablepixels/zmNinja/tree/v1.2.32) (2016-12-09)
-[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.31...v1.2.32)
+## [v1.2.34](https://github.com/pliablepixels/zmNinja/tree/v1.2.34) (2016-12-24)
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.33...v1.2.34)
+
+**Implemented enhancements:**
+
+- Add ability to launch app via URL for external integration [\#411](https://github.com/pliablepixels/zmNinja/issues/411)
+- Allow for pinning and hiding monitors during rearranging in montage [\#409](https://github.com/pliablepixels/zmNinja/issues/409)
+
+**Fixed bugs:**
+
+- First time users - app gets locked if APIs are not configured \[Mostly Android\] [\#415](https://github.com/pliablepixels/zmNinja/issues/415)
+
+**Closed issues:**
+
+- Missing translations Russian [\#412](https://github.com/pliablepixels/zmNinja/issues/412)
+- Missing translations for popup buttons [\#410](https://github.com/pliablepixels/zmNinja/issues/410)
+- Mobile unable to connect to the event server [\#403](https://github.com/pliablepixels/zmNinja/issues/403)
+- Download events as avi,mov, even mp4 videos [\#334](https://github.com/pliablepixels/zmNinja/issues/334)
+
+**Merged pull requests:**
+
+- New items [\#413](https://github.com/pliablepixels/zmNinja/pull/413) ([BoskSpb](https://github.com/BoskSpb))
+
+## [v1.2.33](https://github.com/pliablepixels/zmNinja/tree/v1.2.33) (2016-12-09)
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.31...v1.2.33)
**Implemented enhancements:**
diff --git a/config.xml b/config.xml
index 55fdf1bb..6851a858 100644
--- a/config.xml
+++ b/config.xml
@@ -1,103 +1,107 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version='1.0' encoding='utf-8'?>
<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.34" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
- <name>zmNinja</name>
- <description>
+ <name>zmNinja</name>
+ <description>
High performance ZoneMinder client
</description>
- <author email="pliablepixels@gmail.com" href="http://pliablepixels.us/">
+ <author email="pliablepixels@gmail.com" href="http://pliablepixels.us/">
Pliable Pixels
</author>
- <content src="index.html"/>
- <access origin="*" subdomains="true"/>
- <access launch-external="yes" origin="mailto:*"/>
- <allow-navigation href="*"/>
- <allow-navigation href="http://10.6.1.6:8100"/>
- <allow-intent href="*"/>
- <preference name="AndroidPersistentFileLocation" value="Compatibility"/>
- <preference name="iosPersistentFileLocation" value="Library"/>
- <preference name="AllowInlineMediaPlayback" value="true"/>
- <preference name="CrosswalkAnimatable" value="true"/>
- <preference name="webviewbounce" value="false"/>
- <preference name="UIWebViewBounce" value="false"/>
- <preference name="StatusBarBackgroundColor" value="#2980b9"/>
- <preference name="DisallowOverscroll" value="true"/>
- <preference name="BackupWebStorage" value="none"/>
- <preference name="AutoHideSplashScreen" value="false"/>
- <preference name="ShowSplashScreenSpinner" value="false"/>
- <preference name="SplashScreen" value="screen"/>
- <preference name="deployment-target" value="8.0"/>
- <preference name="SplashScreenDelay" value="300"/>
- <preference name="SplashMaintainAspectRatio" value="true"/>
- <preference name="FadeSplashScreen" value="false"/>
- <preference name="BackgroundColor" value="#444444"/>
- <feature name="StatusBar">
- <param name="ios-package" onload="true" value="CDVStatusBar"/>
- </feature>
- <platform name="ios">
- <config-file parent="NSPhotoLibraryUsageDescription" platform="ios" target="*-Info.plist">
- <string>Store photos of events and live feeds</string>
- </config-file>
- <icon height="57" src="resources/ios/icon/icon.png" width="57"/>
- <icon height="114" src="resources/ios/icon/icon@2x.png" width="114"/>
- <icon height="40" src="resources/ios/icon/icon-40.png" width="40"/>
- <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80"/>
- <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120"/>
- <icon height="50" src="resources/ios/icon/icon-50.png" width="50"/>
- <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100"/>
- <icon height="60" src="resources/ios/icon/icon-60.png" width="60"/>
- <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120"/>
- <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180"/>
- <icon height="72" src="resources/ios/icon/icon-72.png" width="72"/>
- <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144"/>
- <icon height="76" src="resources/ios/icon/icon-76.png" width="76"/>
- <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152"/>
- <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167"/>
- <icon height="29" src="resources/ios/icon/icon-small.png" width="29"/>
- <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58"/>
- <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87"/>
- <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640"/>
- <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750"/>
- <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242"/>
- <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208"/>
- <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048"/>
- <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024"/>
- <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536"/>
- <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768"/>
- <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640"/>
- <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320"/>
- </platform>
- <platform name="android">
- <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png"/>
- <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png"/>
- <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png"/>
- <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png"/>
- <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png"/>
- <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png"/>
- <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png"/>
- <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png"/>
- <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png"/>
- <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png"/>
- <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png"/>
- <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png"/>
- <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png"/>
- <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png"/>
- <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png"/>
- <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png"/>
- <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png"/>
- <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png"/>
- </platform>
- <icon src="resources/android/icon/drawable-xhdpi-icon.png"/>
- <plugin name="cordova-sqlite-storage" spec="~1.4.6-pre6a"/>
- <plugin name="cordova-plugin-settings-hook" spec="~0.2.3"/>
- <plugin name="cordova-plugin-photo-library" spec="~1.2.0">
- <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="images to gallery"/>
- </plugin>
- <plugin name="cordova-plugin-customurlscheme" spec="~4.2.0">
- <variable name="URL_SCHEME" value="zmninja"/>
- <variable name="ANDROID_SCHEME" value=" "/>
- <variable name="ANDROID_HOST" value=" "/>
- <variable name="ANDROID_PATHPREFIX" value="/"/>
- </plugin>
- <engine name="ios" spec="~4.1.1"/>
- <engine name="android" spec="~5.1.1"/>
-</widget> \ No newline at end of file
+ <content src="index.html" />
+ <access origin="*" subdomains="true" />
+ <access launch-external="yes" origin="mailto:*" />
+ <allow-navigation href="*" />
+ <allow-navigation href="http://10.6.1.6:8100" />
+ <allow-intent href="*" />
+ <preference name="AndroidPersistentFileLocation" value="Compatibility" />
+ <preference name="iosPersistentFileLocation" value="Library" />
+ <preference name="AllowInlineMediaPlayback" value="true" />
+ <preference name="CrosswalkAnimatable" value="true" />
+ <preference name="webviewbounce" value="false" />
+ <preference name="UIWebViewBounce" value="false" />
+ <preference name="StatusBarBackgroundColor" value="#2980b9" />
+ <preference name="DisallowOverscroll" value="true" />
+ <preference name="BackupWebStorage" value="none" />
+ <preference name="AutoHideSplashScreen" value="false" />
+ <preference name="ShowSplashScreenSpinner" value="false" />
+ <preference name="SplashScreen" value="screen" />
+ <preference name="deployment-target" value="8.0" />
+ <preference name="SplashScreenDelay" value="300" />
+ <preference name="SplashMaintainAspectRatio" value="true" />
+ <preference name="FadeSplashScreen" value="false" />
+ <preference name="BackgroundColor" value="#444444" />
+ <feature name="StatusBar">
+ <param name="ios-package" onload="true" value="CDVStatusBar" />
+ </feature>
+ <platform name="ios">
+ <config-file parent="NSPhotoLibraryUsageDescription" platform="ios" target="*-Info.plist">
+ <string>Store photos of events and live feeds</string>
+ </config-file>
+ <icon height="57" src="resources/ios/icon/icon.png" width="57" />
+ <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
+ <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
+ <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
+ <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120" />
+ <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
+ <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
+ <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
+ <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
+ <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
+ <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
+ <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
+ <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
+ <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
+ <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" />
+ <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
+ <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
+ <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
+ <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
+ <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
+ <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
+ <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
+ <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
+ <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
+ <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
+ <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
+ <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
+ <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
+ </platform>
+ <platform name="android">
+ <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
+ <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
+ <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
+ <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
+ <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
+ <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
+ <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
+ <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
+ <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
+ <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
+ <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
+ <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
+ <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
+ <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
+ <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
+ <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
+ <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
+ <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
+ </platform>
+ <icon src="resources/android/icon/drawable-xhdpi-icon.png" />
+ <plugin name="cordova-sqlite-storage" spec="~1.4.6-pre6a" />
+ <plugin name="cordova-plugin-settings-hook" spec="~0.2.3" />
+ <plugin name="cordova-plugin-photo-library" spec="~1.2.0">
+ <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="images to gallery" />
+ </plugin>
+ <plugin name="cordova-plugin-customurlscheme" spec="~4.2.0">
+ <variable name="URL_SCHEME" value="zmninja" />
+ <variable name="ANDROID_SCHEME" value=" " />
+ <variable name="ANDROID_HOST" value=" " />
+ <variable name="ANDROID_PATHPREFIX" value="/" />
+ </plugin>
+ <engine name="ios" spec="~4.1.1" />
+ <engine name="android" spec="~5.1.1" />
+ <preference name="xwalkVersion" value="17.46.459.1" />
+ <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" />
+ <preference name="xwalkMode" value="lite" />
+ <preference name="xwalkMultipleApk" value="true" />
+</widget>