You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/09/11 17:29:12 UTC
[30/31] android commit: Merge branch 'master' into 4.0.x (up to
3.7.0-dev)
Merge branch 'master' into 4.0.x (up to 3.7.0-dev)
Conflicts:
VERSION
bin/templates/cordova/version
framework/src/org/apache/cordova/CordovaWebView.java
package.json
test/src/org/apache/cordova/test/basicauth.java
test/src/org/apache/cordova/test/menus.java
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/51e634cc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/51e634cc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/51e634cc
Branch: refs/heads/4.0.x
Commit: 51e634ccb4d64444198ff2a60174e42feab2a183
Parents: 31b1a82 5a82dd5
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Sep 11 10:16:28 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Sep 11 10:16:46 2014 -0400
----------------------------------------------------------------------
RELEASENOTES.md | 129 +++++++++++++++++++++++++++
framework/assets/www/cordova.js | 34 ++++++-
package.json | 54 +++++------
test/assets/www/htmlnotfound/error.html | 23 ++++-
test/assets/www/index.html | 2 +-
test/assets/www/menus/index.html | 2 +-
test/res/values/strings.xml | 2 +-
7 files changed, 210 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/51e634cc/package.json
----------------------------------------------------------------------
diff --cc package.json
index ca620f7,8a6ab09..7f1b8d9
--- a/package.json
+++ b/package.json
@@@ -1,29 -1,28 +1,29 @@@
{
- "name": "cordova-android",
- "version": "4.0.0-dev",
- "description": "cordova-android release",
- "main": "bin/create",
- "repository": {
- "type": "git",
- "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
- },
- "keywords": [
- "android",
- "cordova",
- "apache"
- ],
- "scripts": {
- "test": "jasmine-node --color spec"
- },
- "author": "Apache Software Foundation",
- "license": "Apache version 2.0",
- "dependencies": {
- "q": "^0.9.0",
- "shelljs": "^0.2.6",
- "which": "^1.0.5"
- },
- "devDependencies": {
- "jasmine-node": "~1",
- "promise-matchers": "~0"
- }
+ "name": "cordova-android",
- "version": "3.7.0-dev",
++ "version": "4.0.0-dev",
+ "description": "cordova-android release",
+ "main": "bin/create",
+ "repository": {
+ "type": "git",
+ "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
+ },
+ "keywords": [
+ "android",
+ "cordova",
+ "apache"
+ ],
+ "scripts": {
+ "test": "jasmine-node --color spec"
+ },
+ "author": "Apache Software Foundation",
+ "license": "Apache version 2.0",
+ "dependencies": {
+ "q": "^0.9.0",
- "shelljs": "^0.2.6"
++ "shelljs": "^0.2.6",
++ "which": "^1.0.5"
+ },
+ "devDependencies": {
+ "jasmine-node": "~1",
+ "promise-matchers": "~0"
+ }
-}
+}