cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [09/10] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli
Date Wed, 27 Nov 2013 20:11:31 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli


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

Branch: refs/heads/master
Commit: 9c11350e6f34af24f3d3eb2d2d8f5c4708741d1c
Parents: 4700a64 700c9d6
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Wed Nov 27 11:53:26 2013 -0800
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Wed Nov 27 11:53:26 2013 -0800

----------------------------------------------------------------------
 e2e/create.spec.js                              |  115 ++
 e2e/fixtures/base/.cordova/config.json          |   22 +
 e2e/fixtures/base/merges/.svn                   |    0
 e2e/fixtures/base/platforms/.svn                |    0
 e2e/fixtures/base/plugins/.svn                  |    0
 e2e/fixtures/base/www/config.xml                |   14 +
 e2e/fixtures/base/www/css/index.css             |  115 ++
 e2e/fixtures/base/www/img/logo.png              |  Bin 0 -> 21814 bytes
 e2e/fixtures/base/www/index.html                |   43 +
 e2e/fixtures/base/www/js/index.js               |   49 +
 e2e/fixtures/base/www/spec.html                 |   68 +
 .../android-lib/framework/assets/www/cordova.js |    1 +
 .../platforms/android/AndroidManifest.xml       |   14 +
 .../platforms/android/assets/www/config.xml     |   14 +
 .../platforms/android/assets/www/cordova.js     | 1712 ++++++++++++++++++
 .../android/assets/www/cordova_plugins.js       |    3 +
 .../platforms/android/assets/www/css/index.css  |  115 ++
 .../platforms/android/assets/www/img/logo.png   |  Bin 0 -> 21814 bytes
 .../platforms/android/assets/www/index.html     |   43 +
 .../platforms/android/assets/www/js/index.js    |   49 +
 .../platforms/android/assets/www/spec.html      |   68 +
 e2e/fixtures/platforms/android/build.xml        |   92 +
 e2e/fixtures/platforms/android/cordova/build    |   35 +
 .../platforms/android/cordova/check_reqs        |   27 +
 e2e/fixtures/platforms/android/cordova/clean    |   34 +
 .../platforms/android/cordova/defaults.xml      |   50 +
 .../platforms/android/cordova/lib/appinfo.js    |   41 +
 .../platforms/android/cordova/lib/build.js      |   89 +
 .../platforms/android/cordova/lib/check_reqs.js |   78 +
 .../platforms/android/cordova/lib/clean.js      |   43 +
 .../platforms/android/cordova/lib/device.js     |   95 +
 .../platforms/android/cordova/lib/emulator.js   |  337 ++++
 .../android/cordova/lib/install-device          |   38 +
 .../android/cordova/lib/install-emulator        |   38 +
 .../platforms/android/cordova/lib/list-devices  |   28 +
 .../android/cordova/lib/list-emulator-images    |   29 +
 .../android/cordova/lib/list-started-emulators  |   29 +
 .../platforms/android/cordova/lib/log.js        |   43 +
 .../platforms/android/cordova/lib/run.js        |  123 ++
 .../android/cordova/lib/start-emulator          |   38 +
 e2e/fixtures/platforms/android/cordova/log      |   33 +
 e2e/fixtures/platforms/android/cordova/run      |   35 +
 e2e/fixtures/platforms/android/cordova/version  |   25 +
 e2e/fixtures/platforms/android/local.properties |   10 +
 .../platforms/android/proguard-project.txt      |   20 +
 .../platforms/android/project.properties        |   14 +
 .../android/res/drawable-hdpi/icon.png          |  Bin 0 -> 6080 bytes
 .../android/res/drawable-ldpi/icon.png          |  Bin 0 -> 3096 bytes
 .../android/res/drawable-mdpi/icon.png          |  Bin 0 -> 4090 bytes
 .../android/res/drawable-xhdpi/icon.png         |  Bin 0 -> 7685 bytes
 .../platforms/android/res/drawable/icon.png     |  Bin 0 -> 7685 bytes
 .../platforms/android/res/values/strings.xml    |    4 +
 .../platforms/android/res/xml/config.xml        |   18 +
 .../android/src/org/testing/TestBase.java       |   37 +
 e2e/fixtures/plugins/fake1/plugin.xml           |   10 +
 e2e/helpers.js                                  |   43 +
 e2e/platform.spec.js                            |  117 ++
 e2e/plugin.spec.js                              |   67 +
 package.json                                    |    2 +-
 59 files changed, 4166 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



Mime
View raw message