cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [8/18] ios commit: Merge branch 'master' of git://github.com/apache/incubator-cordova-ios
Date Thu, 06 Dec 2012 22:23:46 GMT
Merge branch 'master' of git://github.com/apache/incubator-cordova-ios


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

Branch: refs/heads/master
Commit: 20777ab31cb95f96e311039f26e551a47ba72555
Parents: ff04241 f90626c
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Sun Sep 2 00:50:10 2012 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Sun Sep 2 00:50:10 2012 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/CDVAvailability.h               |    9 +-
 CordovaLib/Classes/CDVCapture.m                    |   12 +-
 CordovaLib/Classes/CDVContacts.m                   |  305 +-
 CordovaLib/Classes/CDVLocalStorage.h               |    2 +-
 CordovaLib/Classes/CDVLocalStorage.m               |  153 +-
 CordovaLib/Classes/CDVLocation.m                   |    3 +-
 CordovaLib/Classes/CDVViewController.h             |    2 +-
 CordovaLib/Classes/CDVViewController.m             |  139 +-
 CordovaLib/Classes/debugview/CDVDebugWebView.h     |    4 -
 CordovaLib/CordovaLib.xcodeproj/project.pbxproj    |    8 +-
 CordovaLib/CordovaLibApp/AppDelegate.m             |    6 +-
 CordovaLib/CordovaLibApp/ViewController.m          |    9 +
 CordovaLib/VERSION                                 |    2 +-
 CordovaLib/javascript/cordova.ios.js               |  116 +-
 FirstRun.md                                        |    6 +-
 Makefile                                           |    4 -
 README.md                                          |   49 +-
 RELEASENOTES.md                                    |   55 +-
 bin/_build.sh                                      |   92 -
 bin/create                                         |    3 +
 .../project/__TESTING__/Classes/AppDelegate.m      |   36 +-
 .../__TESTING__/Classes/MainViewController.m       |    9 +
 bin/templates/project/www/config.xml               |   47 -
 bin/templates/project/www/cordova-2.0.0.js         | 5242 --------------
 bin/templates/project/www/cordova-2.1.0rc2.js      | 5285 +++++++++++++++
 bin/templates/project/www/css/index.css            |  109 +-
 bin/templates/project/www/img/cordova.png          |  Bin 19932 -> 0 bytes
 bin/templates/project/www/img/logo.png             |  Bin 0 -> 21814 bytes
 bin/templates/project/www/index.html               |   50 +-
 bin/templates/project/www/js/index.js              |   55 +-
 bin/templates/project/www/res/icon/cordova_128.png |  Bin 11401 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_16.png  |  Bin 1699 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_24.png  |  Bin 2215 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_256.png |  Bin 27408 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_32.png  |  Bin 2843 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_48.png  |  Bin 4111 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_512.png |  Bin 39830 -> 0 bytes
 bin/templates/project/www/res/icon/cordova_64.png  |  Bin 5463 -> 0 bytes
 .../project/www/res/icon/cordova_android_36.png    |  Bin 3096 -> 0 bytes
 .../project/www/res/icon/cordova_android_48.png    |  Bin 4090 -> 0 bytes
 .../project/www/res/icon/cordova_android_72.png    |  Bin 6080 -> 0 bytes
 .../project/www/res/icon/cordova_android_96.png    |  Bin 7685 -> 0 bytes
 .../project/www/res/icon/cordova_bb_80.png         |  Bin 7287 -> 0 bytes
 .../project/www/res/icon/cordova_ios_114.png       |  Bin 7869 -> 0 bytes
 .../project/www/res/icon/cordova_ios_144.png       |  Bin 11706 -> 0 bytes
 .../project/www/res/icon/cordova_ios_57.png        |  Bin 3908 -> 0 bytes
 .../project/www/res/icon/cordova_ios_72.png        |  Bin 4944 -> 0 bytes
 .../project/www/res/icon/ios/icon-57-2x.png        |  Bin 0 -> 7869 bytes
 bin/templates/project/www/res/icon/ios/icon-57.png |  Bin 0 -> 3908 bytes
 .../project/www/res/icon/ios/icon-72-2x.png        |  Bin 0 -> 11706 bytes
 bin/templates/project/www/res/icon/ios/icon-72.png |  Bin 0 -> 4944 bytes
 .../www/res/screen/android_hdpi_landscape.png      |  Bin 218302 -> 0 bytes
 .../www/res/screen/android_hdpi_portrait.png       |  Bin 222148 -> 0 bytes
 .../www/res/screen/android_ldpi_landscape.png      |  Bin 42616 -> 0 bytes
 .../www/res/screen/android_ldpi_portrait.png       |  Bin 42034 -> 0 bytes
 .../www/res/screen/android_mdpi_landscape.png      |  Bin 92347 -> 0 bytes
 .../www/res/screen/android_mdpi_portrait.png       |  Bin 90555 -> 0 bytes
 .../www/res/screen/android_xhdpi_landscape.png     |  Bin 489604 -> 0 bytes
 .../www/res/screen/android_xhdpi_portrait.png      |  Bin 504508 -> 0 bytes
 .../www/res/screen/blackberry_transparent_300.png  |  Bin 15823 -> 0 bytes
 .../www/res/screen/blackberry_transparent_400.png  |  Bin 11001 -> 0 bytes
 .../res/screen/ios/screen-ipad-landscape-2x.png    |  Bin 0 -> 1534088 bytes
 .../www/res/screen/ios/screen-ipad-landscape.png   |  Bin 0 -> 407370 bytes
 .../www/res/screen/ios/screen-ipad-portrait-2x.png |  Bin 0 -> 1610434 bytes
 .../www/res/screen/ios/screen-ipad-portrait.png    |  Bin 0 -> 422441 bytes
 .../res/screen/ios/screen-iphone-landscape-2x.png  |  Bin 0 -> 339639 bytes
 .../www/res/screen/ios/screen-iphone-landscape.png |  Bin 0 -> 92301 bytes
 .../res/screen/ios/screen-iphone-portrait-2x.png   |  Bin 0 -> 350593 bytes
 .../www/res/screen/ios/screen-iphone-portrait.png  |  Bin 0 -> 93897 bytes
 .../project/www/res/screen/ipad_landscape.png      |  Bin 407370 -> 0 bytes
 .../project/www/res/screen/ipad_portrait.png       |  Bin 422441 -> 0 bytes
 .../www/res/screen/ipad_retina_landscape.png       |  Bin 1534088 -> 0 bytes
 .../www/res/screen/ipad_retina_portrait.png        |  Bin 1610434 -> 0 bytes
 .../project/www/res/screen/iphone_landscape.png    |  Bin 92301 -> 0 bytes
 .../project/www/res/screen/iphone_portrait.png     |  Bin 93897 -> 0 bytes
 .../www/res/screen/iphone_retina_landscape.png     |  Bin 339639 -> 0 bytes
 .../www/res/screen/iphone_retina_portrait.png      |  Bin 350593 -> 0 bytes
 .../www/res/screen/windows_phone_portrait.jpg      |  Bin 11483 -> 0 bytes
 bin/templates/project/www/spec.html                |   18 +
 bin/templates/project/www/spec/helper.js           |   22 +
 bin/templates/project/www/spec/index.js            |   56 +-
 bin/update_cordova_subproject                      |   71 +
 ...hanging the JavaScript to Native Bridge Mode.md |   36 +
 guides/Create a New Project.webloc                 |    2 +-
 84 files changed, 6101 insertions(+), 5916 deletions(-)
----------------------------------------------------------------------



Mime
View raw message