Merge branch 'master' of github.com:librenms/myLibreNMS into ionic-pro

librenms · Jun 26, 2018 · 171abef · 171abef
2 parents 737af37 + 4d8ae2a
commit 171abef
Show file tree

Hide file tree

Showing 18 changed files with 1,179 additions and 1,553 deletions.
diff --git a/config.xml b/config.xml
@@ -86,16 +86,14 @@
     <feature name="CDVWKWebViewEngine">
         <param name="ios-package" value="CDVWKWebViewEngine" />
     </feature>
-    <preference name="CordovaWebViewEngine" value="CDVUIWebViewEngine" />
+    <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
     <engine name="android" spec="^6.2.3" />
     <engine name="browser" spec="^4.1.0" />
     <engine name="ios" spec="^4.5.4" />
-    <plugin name="cordova-plugin-advanced-http" spec="^1.9.1" />
     <plugin name="cordova-plugin-console" spec="^1.0.7" />
     <plugin name="cordova-plugin-device" spec="^1.1.6" />
     <plugin name="cordova-plugin-inappbrowser" spec="^1.7.1" />
-    <plugin name="cordova-plugin-ionic-webview" spec="^1.1.16" />
     <plugin name="cordova-plugin-screen-orientation" spec="^1.4.3" />
     <plugin name="cordova-plugin-statusbar" spec="^2.2.3" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
@@ -104,7 +102,9 @@
     <plugin name="phonegap-plugin-barcodescanner" spec="^6.0.8">
         <variable name="CAMERA_USAGE_DESCRIPTION" value="Scan QR-Codes" />
     </plugin>
+    <plugin name="cordova-plugin-advanced-http" spec="~1.11.1" />
     <plugin name="cordova-plugin-globalization" spec="^1.11.0" />
+    <plugin name="cordova-plugin-ionic-webview" spec="^1.1.16" />
     <plugin name="cordova-plugin-ionic" spec="^3.1.3">
         <variable name="APP_ID" value="2a038c89" />
         <variable name="CHANNEL_NAME" value="Production" />