merge

20 files changed, 21 insertions, 21 deletions

diff --git a/StoneIsland/platforms/ios/platform_www/cordova-js-src/exec.js b/StoneIsland/platforms/ios/platform_www/cordova-js-src/exec.js
index 32a3f8b5..32a3f8b5 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/cordova-js-src/exec.js
+++ b/StoneIsland/platforms/ios/platform_www/cordova-js-src/exec.js
diff --git a/StoneIsland/platforms/ios/platform_www/cordova-js-src/platform.js b/StoneIsland/platforms/ios/platform_www/cordova-js-src/platform.js
index 36529ba5..36529ba5 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/cordova-js-src/platform.js
+++ b/StoneIsland/platforms/ios/platform_www/cordova-js-src/platform.js
diff --git a/StoneIsland/platforms/ios/platform_www/cordova.js b/StoneIsland/platforms/ios/platform_www/cordova.js
index 46ab90b7..46ab90b7 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/cordova.js
+++ b/StoneIsland/platforms/ios/platform_www/cordova.js
diff --git a/StoneIsland/platforms/ios/platform_www/cordova_plugins.js b/StoneIsland/platforms/ios/platform_www/cordova_plugins.js
index ba2c072d..1c1c9718 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/cordova_plugins.js
+++ b/StoneIsland/platforms/ios/platform_www/cordova_plugins.js
@@ -9,6 +9,14 @@ module.exports = [
         ]
     },
     {
+        "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js",
+        "id": "com.parse.cordova.core.pushplugin.ParsePlugin",
+        "pluginId": "com.parse.cordova.core.pushplugin",
+        "clobbers": [
+            "window.parsePlugin"
+        ]
+    },
+    {
         "file": "plugins/cordova-plugin-console/www/logger.js",
         "id": "cordova-plugin-console.logger",
         "pluginId": "cordova-plugin-console",
@@ -81,6 +89,15 @@ module.exports = [
         ]
     },
     {
+        "file": "plugins/cordova-plugin-inappbrowser/www/inappbrowser.js",
+        "id": "cordova-plugin-inappbrowser.inappbrowser",
+        "pluginId": "cordova-plugin-inappbrowser",
+        "clobbers": [
+            "cordova.InAppBrowser.open",
+            "window.open"
+        ]
+    },
+    {
         "file": "plugins/cordova-plugin-network-information/www/network.js",
         "id": "cordova-plugin-network-information.network",
         "pluginId": "cordova-plugin-network-information",
@@ -120,41 +137,24 @@ module.exports = [
         "clobbers": [
             "PushNotification"
         ]
-    },
-    {
-        "file": "plugins/cordova-plugin-inappbrowser/www/inappbrowser.js",
-        "id": "cordova-plugin-inappbrowser.inappbrowser",
-        "pluginId": "cordova-plugin-inappbrowser",
-        "clobbers": [
-            "cordova.InAppBrowser.open",
-            "window.open"
-        ]
-    },
-    {
-        "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js",
-        "id": "com.parse.cordova.core.pushplugin.ParsePlugin",
-        "pluginId": "com.parse.cordova.core.pushplugin",
-        "clobbers": [
-            "window.parsePlugin"
-        ]
     }
 ];
 module.exports.metadata = 
 // TOP OF METADATA
 {
     "com.ionic.keyboard": "1.0.4",
+    "com.parse.cordova.core.pushplugin": "0.1.0",
     "cordova-plugin-console": "1.0.1",
     "cordova-plugin-customurlscheme": "4.0.0",
     "cordova-plugin-device": "1.0.1",
     "cordova-plugin-dialogs": "1.1.1",
     "cordova-plugin-geolocation": "1.0.1",
+    "cordova-plugin-inappbrowser": "1.1.0",
     "cordova-plugin-network-information": "1.0.1",
-    "cordova-plugin-splashscreen": "2.1.0",
+    "cordova-plugin-splashscreen": "3.0.0",
     "cordova-plugin-whitelist": "1.0.0",
     "cordova-plugin-x-socialsharing": "5.0.7",
-    "phonegap-plugin-push": "1.4.4",
-    "cordova-plugin-inappbrowser": "1.1.0",
-    "com.parse.cordova.core.pushplugin": "0.1.0"
+    "phonegap-plugin-push": "1.4.4"
 }
 // BOTTOM OF METADATA
 });
\ No newline at end of file
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/com.ionic.keyboard/www/keyboard.js b/StoneIsland/platforms/ios/platform_www/plugins/com.ionic.keyboard/www/keyboard.js
index 7d30ba59..7d30ba59 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/com.ionic.keyboard/www/keyboard.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/com.ionic.keyboard/www/keyboard.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-console/www/console-via-logger.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-console/www/console-via-logger.js
index 0ce8cea8..0ce8cea8 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-console/www/console-via-logger.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-console/www/console-via-logger.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-console/www/logger.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-console/www/logger.js
index 7a9a75d3..7a9a75d3 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-console/www/logger.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-console/www/logger.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js
index 3568c73f..3568c73f 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-device/www/device.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-device/www/device.js
index 023bafd2..023bafd2 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-device/www/device.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-device/www/device.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-dialogs/www/notification.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-dialogs/www/notification.js
index ea97eefb..ea97eefb 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-dialogs/www/notification.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-dialogs/www/notification.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/Coordinates.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/Coordinates.js
index f7255659..f7255659 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/Coordinates.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/Coordinates.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/Position.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/Position.js
index 206bf8b4..206bf8b4 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/Position.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/Position.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/PositionError.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/PositionError.js
index 11ffe491..11ffe491 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/PositionError.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/PositionError.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/geolocation.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/geolocation.js
index ec9bb6e8..ec9bb6e8 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/geolocation.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-geolocation/www/geolocation.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js
index 6c7a844a..6c7a844a 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-network-information/www/Connection.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-network-information/www/Connection.js
index 1450e953..1450e953 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-network-information/www/Connection.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-network-information/www/Connection.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-network-information/www/network.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-network-information/www/network.js
index bfac2e3f..bfac2e3f 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-network-information/www/network.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-network-information/www/network.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-splashscreen/www/splashscreen.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-splashscreen/www/splashscreen.js
index 0e6a10af..0e6a10af 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-splashscreen/www/splashscreen.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-splashscreen/www/splashscreen.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js
index aa82acf6..aa82acf6 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js
diff --git a/StoneIsland/platforms/ios/platform_www/plugins/phonegap-plugin-push/www/push.js b/StoneIsland/platforms/ios/platform_www/plugins/phonegap-plugin-push/www/push.js
index 7aa30fd7..7aa30fd7 100755..100644
--- a/StoneIsland/platforms/ios/platform_www/plugins/phonegap-plugin-push/www/push.js
+++ b/StoneIsland/platforms/ios/platform_www/plugins/phonegap-plugin-push/www/push.js