You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/10/28 23:12:55 UTC

[1/4] git commit: [CB-5010] Updated version and RELEASENOTES.md for release 0.2.3

Updated Branches:
  refs/heads/dev b3348cff6 -> d49d6ec62


[CB-5010] Updated version and RELEASENOTES.md for release 0.2.3


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/4d4d479b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/4d4d479b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/4d4d479b

Branch: refs/heads/dev
Commit: 4d4d479b3c0467da69911b960bbf47ca6a80c897
Parents: 3d8b04f
Author: Steven Gill <st...@gmail.com>
Authored: Wed Oct 9 15:27:18 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Oct 9 15:27:18 2013 -0700

----------------------------------------------------------------------
 RELEASENOTES.md | 4 ++++
 plugin.xml      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/4d4d479b/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0dbdbc5..548a6a2 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -32,3 +32,7 @@
 * Rename CHANGELOG.md -> RELEASENOTES.md
 * [CB-4792] Added keepCallback to the show function.
 * [CB-4752] Incremented plugin version on dev branch.
+
+### 0.2.3 (Oct 9, 2013)
+* [CB-4915] Incremented plugin version on dev branch.
+* [CB-4926] Fixes inappbrowser plugin loading for windows8
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/4d4d479b/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 9a53bd2..03cb490 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.inappbrowser"
-      version="0.2.3-dev">
+      version="0.2.3">
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>
     <license>Apache 2.0</license>


[4/4] git commit: CB-5188:

Posted by st...@apache.org.
CB-5188:


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/d49d6ec6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/d49d6ec6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/d49d6ec6

Branch: refs/heads/dev
Commit: d49d6ec62f21029dcd6da23a9cb6b024ddf556de
Parents: a806021
Author: Steven Gill <st...@gmail.com>
Authored: Mon Oct 28 12:27:15 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Oct 28 12:27:15 2013 -0700

----------------------------------------------------------------------
 plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/d49d6ec6/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 94cfb82..74c9c3b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.inappbrowser"
-      version="0.2.4">
+      version="0.2.5-dev">
 
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>


[2/4] git commit: [CB-5188] Updated version and RELEASENOTES.md for release 0.2.4

Posted by st...@apache.org.
[CB-5188] Updated version and RELEASENOTES.md for release 0.2.4


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/e5868f8e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/e5868f8e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/e5868f8e

Branch: refs/heads/dev
Commit: e5868f8ecb0bd1f1a7a4fd868a437efab7dd020a
Parents: b3348cf
Author: Steven Gill <st...@gmail.com>
Authored: Mon Oct 28 12:03:26 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Oct 28 12:03:26 2013 -0700

----------------------------------------------------------------------
 RELEASENOTES.md | 14 +++++++++++++-
 plugin.xml      |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/e5868f8e/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 548a6a2..a85c6d6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -35,4 +35,16 @@
 
 ### 0.2.3 (Oct 9, 2013)
 * [CB-4915] Incremented plugin version on dev branch.
-* [CB-4926] Fixes inappbrowser plugin loading for windows8
\ No newline at end of file
+* [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

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/e5868f8e/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index e844766..d0f2bf4 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.inappbrowser"
-      version="0.2.4-dev">
+      version="0.2.4">
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>
     <license>Apache 2.0</license>


[3/4] git commit: fixed merge conflict

Posted by st...@apache.org.
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 <st...@gmail.com>
Authored: Mon Oct 28 12:13:43 2013 -0700
Committer: Steven Gill <st...@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>