You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/09/10 20:06:51 UTC

[1/3] git commit: Merge branch 'master' into browserPlatform

Repository: cordova-lib
Updated Branches:
  refs/heads/master 3a71397d8 -> 5a05badf8


Merge branch 'master' into browserPlatform


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

Branch: refs/heads/master
Commit: ff81f6ef21d99026046dd03c40f1c7cfa3353363
Parents: 5eaa778 190eb20
Author: Suraj Pindoria <su...@yahoo.com>
Authored: Thu Aug 7 11:41:03 2014 -0700
Committer: Suraj Pindoria <su...@yahoo.com>
Committed: Thu Aug 7 11:41:03 2014 -0700

----------------------------------------------------------------------
 cordova-lib/.jscs.json                          |  24 +
 cordova-lib/package.json                        |   2 +-
 cordova-lib/spec-cordova/lazy_load.spec.js      |   8 +-
 .../metadata/blackberry_parser.spec.js          |  21 +-
 cordova-lib/spec-cordova/run.spec.js            |   4 +-
 .../spec-plugman/install-browserify.spec.js     | 505 +++++++++++++++++++
 .../spec-plugman/uninstall-browserify.spec.js   | 309 ++++++++++++
 .../src/cordova/metadata/blackberry10_parser.js |  22 +-
 cordova-lib/src/cordova/platforms.js            |   2 +-
 cordova-lib/src/cordova/plugin.js               |   1 +
 cordova-lib/src/cordova/prepare.js              |   8 +-
 cordova-lib/src/cordova/run.js                  |   2 +-
 cordova-lib/src/events.js                       |   2 +-
 cordova-lib/src/plugman/fetch.js                |  68 ++-
 cordova-lib/src/plugman/install.js              |   6 +-
 cordova-lib/src/plugman/plugman.js              |  34 +-
 cordova-lib/src/plugman/prepare-browserify.js   |   2 +-
 cordova-lib/src/plugman/registry/registry.js    |  12 +-
 cordova-lib/src/plugman/uninstall.js            |  10 +-
 cordova-lib/src/plugman/util/config-changes.js  |   2 +-
 cordova-lib/src/util/windows/jsproj.js          |   2 +-
 21 files changed, 969 insertions(+), 77 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/ff81f6ef/cordova-lib/src/cordova/platforms.js
----------------------------------------------------------------------


[3/3] git commit: Merge branch 'browserPlatform' of https://github.com/surajpindoria/cordova-lib

Posted by an...@apache.org.
Merge branch 'browserPlatform' of https://github.com/surajpindoria/cordova-lib


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/5a05badf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/5a05badf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/5a05badf

Branch: refs/heads/master
Commit: 5a05badf8e0af9e77573466f7beed94387ce804a
Parents: 3a71397 a2b95a8
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 10 11:05:52 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 10 11:05:52 2014 -0700

----------------------------------------------------------------------
 cordova-lib/src/cordova/platforms.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/5a05badf/cordova-lib/src/cordova/platforms.js
----------------------------------------------------------------------


[2/3] git commit: Update browser platform version

Posted by an...@apache.org.
Update browser platform version


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

Branch: refs/heads/master
Commit: a2b95a882d8e96b4ab09902d53e01ce9826f8733
Parents: ff81f6e
Author: Suraj Pindoria <su...@yahoo.com>
Authored: Wed Sep 10 10:52:12 2014 -0700
Committer: Suraj Pindoria <su...@yahoo.com>
Committed: Wed Sep 10 10:52:12 2014 -0700

----------------------------------------------------------------------
 cordova-lib/src/cordova/platforms.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a2b95a88/cordova-lib/src/cordova/platforms.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platforms.js b/cordova-lib/src/cordova/platforms.js
index cde3809..0ae9c6d 100644
--- a/cordova-lib/src/cordova/platforms.js
+++ b/cordova-lib/src/cordova/platforms.js
@@ -85,7 +85,7 @@ module.exports = {
     'browser':{
         parser : './metadata/browser_parser',
         url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-browser.git',
-        version: 'master'
+        version: '3.5.1'
     }
 };