cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [3/4] git commit: fixed merge conflict
Date Mon, 28 Oct 2013 22:12:57 GMT
fixed merge conflict


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/a8060219
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/a8060219
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/a8060219

Branch: refs/heads/dev
Commit: a8060219d5aa22b17c2f5ed0a1eb109ec68dc3da
Parents: 4d4d479 e5868f8
Author: Steven Gill <stevengill97@gmail.com>
Authored: Mon Oct 28 12:13:43 2013 -0700
Committer: Steven Gill <stevengill97@gmail.com>
Committed: Mon Oct 28 12:13:43 2013 -0700

----------------------------------------------------------------------
 RELEASENOTES.md               |  15 +-
 plugin.xml                    |   8 +-
 src/android/InAppBrowser.java | 322 ++++++++++++++++++-------------------
 src/ios/CDVInAppBrowser.m     |  52 ++++--
 www/InAppBrowser.js           |  18 ++-
 5 files changed, 236 insertions(+), 179 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/a8060219/RELEASENOTES.md
----------------------------------------------------------------------
diff --cc RELEASENOTES.md
index 548a6a2,a85c6d6..5ad2e29
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@@ -35,4 -35,16 +35,17 @@@
  
  ### 0.2.3 (Oct 9, 2013)
  * [CB-4915] Incremented plugin version on dev branch.
- * [CB-4926] Fixes inappbrowser plugin loading for windows8
+ * [CB-4926] Fixes inappbrowser plugin loading for windows8
+ 
+ ### 0.2.4 (Oct 28, 2013)
+ * CB-5128: added repo + issue tag to plugin.xml for inappbrowser plugin
+ * CB-4995 Fix crash when WebView is quickly opened then closed.
+ * CB-4930 - iOS - InAppBrowser should take into account the status bar
+ * [CB-5010] Incremented plugin version on dev branch.
+ * [CB-5010] Updated version and RELEASENOTES.md for release 0.2.3
+ * CB-4858 - Run IAB methods on the UI thread.
+ * CB-4858 Convert relative URLs to absolute URLs in JS
+ * CB-3747 Fix back button having different dismiss logic from the close button.
+ * CB-5021 Expose closeDialog() as a public function and make it safe to call multiple times.
+ * CB-5021 Make it safe to call close() multiple times
++>>>>>>> dev

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/a8060219/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index 03cb490,d0f2bf4..94cfb82
--- a/plugin.xml
+++ b/plugin.xml
@@@ -2,7 -2,7 +2,8 @@@
  
  <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
             id="org.apache.cordova.inappbrowser"
-       version="0.2.3">
+       version="0.2.4">
++
      <name>InAppBrowser</name>
      <description>Cordova InAppBrowser Plugin</description>
      <license>Apache 2.0</license>


Mime
View raw message