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/06/14 01:46:25 UTC
[9/9] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-lib
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-lib
Conflicts:
cordova-lib/npm-shrinkwrap.json
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/da884bf1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/da884bf1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/da884bf1
Branch: refs/heads/master
Commit: da884bf14e526c9ea71c4e1b588783a8892b67c6
Parents: 4f18510 5c88df0
Author: Anis Kadri <an...@apache.org>
Authored: Fri Jun 13 16:44:56 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Jun 13 16:44:56 2014 -0700
----------------------------------------------------------------------
cordova-lib/npm-shrinkwrap.json | 5 +-
cordova-lib/package.json | 2 +-
cordova-lib/spec-cordova/helpers.js | 18 ++
cordova-lib/spec-cordova/platform.spec.js | 18 ++
cordova-lib/spec-cordova/plugin.spec.js | 18 ++
cordova-lib/spec-cordova/wrappers.spec.js | 18 ++
cordova-lib/spec-plugman/add_platform.spec.js | 18 ++
cordova-lib/spec-plugman/adduser.spec.js | 18 ++
cordova-lib/spec-plugman/common.js | 18 ++
cordova-lib/spec-plugman/config.spec.js | 18 ++
cordova-lib/spec-plugman/create.spec.js | 18 ++
cordova-lib/spec-plugman/fetch.spec.js | 18 ++
cordova-lib/spec-plugman/info.spec.js | 18 ++
cordova-lib/spec-plugman/install.spec.js | 18 ++
cordova-lib/spec-plugman/owner.spec.js | 18 ++
cordova-lib/spec-plugman/platform.spec.js | 18 ++
.../platforms/amazon-fireos.spec.js | 18 ++
.../spec-plugman/platforms/android.spec.js | 18 ++
.../spec-plugman/platforms/blackberry10.spec.js | 18 ++
cordova-lib/spec-plugman/platforms/ios.spec.js | 18 ++
.../spec-plugman/platforms/windows8.spec.js | 18 ++
cordova-lib/spec-plugman/platforms/wp8.spec.js | 18 ++
cordova-lib/spec-plugman/prepare.spec.js | 18 ++
cordova-lib/spec-plugman/publish.spec.js | 18 ++
.../spec-plugman/registry/registry.spec.js | 18 ++
cordova-lib/spec-plugman/search.spec.js | 18 ++
cordova-lib/spec-plugman/uninstall.spec.js | 18 ++
cordova-lib/spec-plugman/unpublish.spec.js | 18 ++
.../spec-plugman/util/action-stack.spec.js | 18 ++
.../spec-plugman/util/config-changes.spec.js | 18 ++
cordova-lib/spec-plugman/util/csproj.spec.js | 18 ++
.../spec-plugman/util/dependencies.spec.js | 18 ++
cordova-lib/spec-plugman/wrappers.spec.js | 18 ++
cordova-lib/src/cordova/hooker.js | 2 +-
cordova-lib/src/cordova/lazy_load.js | 282 +++++++++---------
.../src/cordova/metadata/firefoxos_parser.js | 101 ++++---
cordova-lib/src/cordova/platform.js | 211 +++++++++-----
cordova-lib/src/cordova/util.js | 286 +++++++++++--------
cordova-lib/src/plugman/adduser.js | 18 ++
cordova-lib/src/plugman/config.js | 18 ++
cordova-lib/src/plugman/events.js | 18 ++
cordova-lib/src/plugman/fetch.js | 18 ++
cordova-lib/src/plugman/info.js | 18 ++
cordova-lib/src/plugman/install.js | 18 ++
cordova-lib/src/plugman/owner.js | 18 ++
cordova-lib/src/plugman/platform.js | 18 ++
cordova-lib/src/plugman/platform_operation.js | 18 ++
cordova-lib/src/plugman/platforms.js | 18 ++
cordova-lib/src/plugman/platforms/common.js | 18 ++
cordova-lib/src/plugman/platforms/firefoxos.js | 18 ++
cordova-lib/src/plugman/platforms/tizen.js | 18 ++
cordova-lib/src/plugman/publish.js | 18 ++
cordova-lib/src/plugman/registry/manifest.js | 18 ++
cordova-lib/src/plugman/registry/registry.js | 18 ++
cordova-lib/src/plugman/registry/whitelist.js | 18 ++
cordova-lib/src/plugman/search.js | 18 ++
cordova-lib/src/plugman/uninstall.js | 18 ++
cordova-lib/src/plugman/unpublish.js | 18 ++
cordova-lib/src/plugman/util/action-stack.js | 18 ++
cordova-lib/src/plugman/util/android-project.js | 20 +-
cordova-lib/src/plugman/util/csproj.js | 18 ++
cordova-lib/src/plugman/util/default-engines.js | 18 ++
cordova-lib/src/plugman/util/dependencies.js | 18 ++
cordova-lib/src/plugman/util/metadata.js | 18 ++
cordova-lib/src/plugman/util/w8jsproj.js | 18 ++
cordova-lib/templates/hooks-README.md | 5 +-
66 files changed, 1557 insertions(+), 383 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da884bf1/cordova-lib/npm-shrinkwrap.json
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da884bf1/cordova-lib/package.json
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da884bf1/cordova-lib/src/plugman/install.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da884bf1/cordova-lib/src/plugman/uninstall.js
----------------------------------------------------------------------