cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [12/18] ios commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-ios
Date Thu, 06 Dec 2012 22:23:47 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/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/bee6e9d8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/bee6e9d8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/bee6e9d8

Branch: refs/heads/master
Commit: bee6e9d880d5a8b4b1125cbe77bc482d5bd893df
Parents: 8898ae4 4faa296
Author: purplecabbage <purplecabbage@gmail.com>
Authored: Fri Jul 27 11:32:13 2012 -0700
Committer: purplecabbage <purplecabbage@gmail.com>
Committed: Fri Jul 27 11:32:13 2012 -0700

----------------------------------------------------------------------
 Cordova-based Application.xctemplate/README        |    5 -
 .../TemplateInfo.plist                             |  438 --
 Cordova-based Application/.gitignore               |    6 -
 Cordova-based Application/Classes/AppDelegate.h    |   50 -
 Cordova-based Application/Classes/AppDelegate.m    |  140 -
 .../Classes/MainViewController.h                   |   36 -
 .../Classes/MainViewController.m                   |  140 -
 .../Classes/MainViewController.xib                 |  138 -
 Cordova-based Application/Cordova.plist            |   81 -
 .../CordovaBuildSettings.xcconfig                  |   26 -
 Cordova-based Application/Plugins/README           |   20 -
 .../Resources/Capture.bundle/controls_bg.png       |  Bin 955 -> 0 bytes
 .../Resources/Capture.bundle/controls_bg@2x.png    |  Bin 971 -> 0 bytes
 .../Capture.bundle/controls_bg@2x~ipad.png         |  Bin 2858 -> 0 bytes
 .../Resources/Capture.bundle/controls_bg~ipad.png  |  Bin 969 -> 0 bytes
 .../Resources/Capture.bundle/microphone.png        |  Bin 72226 -> 0 bytes
 .../Resources/Capture.bundle/microphone@2x.png     |  Bin 282409 -> 0 bytes
 .../Capture.bundle/microphone@2x~ipad.png          |  Bin 911582 -> 0 bytes
 .../Resources/Capture.bundle/microphone~ipad.png   |  Bin 393975 -> 0 bytes
 .../Resources/Capture.bundle/record_button.png     |  Bin 5852 -> 0 bytes
 .../Resources/Capture.bundle/record_button@2x.png  |  Bin 13875 -> 0 bytes
 .../Capture.bundle/record_button@2x~ipad.png       |  Bin 15822 -> 0 bytes
 .../Capture.bundle/record_button~ipad.png          |  Bin 7547 -> 0 bytes
 .../Resources/Capture.bundle/recording_bg.png      |  Bin 973 -> 0 bytes
 .../Resources/Capture.bundle/recording_bg@2x.png   |  Bin 990 -> 0 bytes
 .../Capture.bundle/recording_bg@2x~ipad.png        |  Bin 1026 -> 0 bytes
 .../Resources/Capture.bundle/recording_bg~ipad.png |  Bin 996 -> 0 bytes
 .../Resources/Capture.bundle/stop_button.png       |  Bin 5514 -> 0 bytes
 .../Resources/Capture.bundle/stop_button@2x.png    |  Bin 12965 -> 0 bytes
 .../Capture.bundle/stop_button@2x~ipad.png         |  Bin 14474 -> 0 bytes
 .../Resources/Capture.bundle/stop_button~ipad.png  |  Bin 7119 -> 0 bytes
 .../Resources/de.lproj/Localizable.strings         |   26 -
 .../Resources/en.lproj/Localizable.strings         |   25 -
 .../Resources/es.lproj/Localizable.strings         |   25 -
 .../Resources/icons/icon-72.png                    |  Bin 4944 -> 0 bytes
 .../Resources/icons/icon-72@2x.png                 |  Bin 11706 -> 0 bytes
 Cordova-based Application/Resources/icons/icon.png |  Bin 3902 -> 0 bytes
 .../Resources/icons/icon@2x.png                    |  Bin 7869 -> 0 bytes
 .../Resources/se.lproj/Localizable.strings         |   26 -
 .../Resources/splash/Default-Landscape@2x~ipad.png |  Bin 1534088 -> 0 bytes
 .../Resources/splash/Default-Landscape~ipad.png    |  Bin 423095 -> 0 bytes
 .../Resources/splash/Default-Portrait@2x~ipad.png  |  Bin 1610434 -> 0 bytes
 .../Resources/splash/Default-Portrait~ipad.png     |  Bin 421667 -> 0 bytes
 .../Resources/splash/Default@2x~iphone.png         |  Bin 350593 -> 0 bytes
 .../Resources/splash/Default~iphone.png            |  Bin 93897 -> 0 bytes
 .../___PROJECTNAMEASIDENTIFIER___-Info.plist       |   78 -
 .../___PROJECTNAMEASIDENTIFIER___-Prefix.pch       |   26 -
 .../___PROJECTNAME___.xcodeproj/TemplateIcon.icns  |  Bin 183175 -> 0 bytes
 .../___PROJECTNAME___.xcodeproj/TemplateInfo.plist |   28 -
 .../___PROJECTNAME___.xcodeproj/project.pbxproj    |  643 --
 Cordova-based Application/main.m                   |   35 -
 Cordova-based Application/verify.sh                |   31 -
 Cordova-based Application/www/index.html           |   84 -
 .../01cordovalib-contents.xml                      |   40 +-
 .../CordovaInstaller.pmdoc/01cordovalib.xml        |   72 +-
 .../CordovaInstaller.pmdoc/02cordova-contents.xml  |   21 -
 .../CordovaInstaller.pmdoc/02cordova.xml           |   21 -
 .../CordovaInstaller.pmdoc/03cordova-contents.xml  |   21 -
 .../CordovaInstaller.pmdoc/03cordova.xml           |   21 -
 .../CordovaInstaller.pmdoc/04cordova-contents.xml  |   21 -
 .../CordovaInstaller.pmdoc/04cordova.xml           |   21 -
 CordovaInstaller/CordovaInstaller.pmdoc/index.xml  |  111 +-
 CordovaInstaller/docs/.gitignore                   |    4 +-
 CordovaInstaller/docs/finishup.md                  |   70 -
 CordovaInstaller/docs/releasenotes.md              |  467 --
 CordovaInstaller/scripts/framework.postinstall     |   29 -
 CordovaInstaller/scripts/framework.preinstall      |   26 -
 CordovaInstaller/scripts/xcodetemplate.preinstall  |   22 -
 CordovaInstaller/scripts/xcodevars.postinstall     |   10 +
 CordovaLib/Classes/CDV.h                           |    1 +
 CordovaLib/Classes/CDVAvailability.h               |    3 +-
 CordovaLib/Classes/CDVCapture.m                    |    2 +-
 CordovaLib/Classes/CDVContact.m                    |    2 +-
 CordovaLib/Classes/CDVDevice.h                     |   33 +
 CordovaLib/Classes/CDVDevice.m                     |  103 +
 CordovaLib/Classes/CDVFile.m                       |    4 +
 CordovaLib/Classes/CDVFileTransfer.h               |    9 +-
 CordovaLib/Classes/CDVFileTransfer.m               |  225 +-
 CordovaLib/Classes/CDVLocalStorage.h               |    9 +-
 CordovaLib/Classes/CDVLocalStorage.m               |   58 +-
 CordovaLib/Classes/CDVPlugin.h                     |   19 -
 CordovaLib/Classes/CDVPlugin.m                     |   34 -
 CordovaLib/Classes/CDVPluginResult.m               |    2 +-
 CordovaLib/Classes/CDVSound.m                      |    3 +-
 CordovaLib/Classes/CDVViewController.h             |    5 +-
 CordovaLib/Classes/CDVViewController.m             |   96 +-
 CordovaLib/Classes/JSON/JSONKit.h                  |   64 +-
 CordovaLib/Classes/JSON/JSONKit.m                  |   84 +-
 CordovaLib/Classes/NSArray+Comparisons.h           |   27 +
 CordovaLib/Classes/NSArray+Comparisons.m           |   40 +
 CordovaLib/Classes/NSMutableArray+QueueAdditions.h |    7 -
 CordovaLib/Classes/NSMutableArray+QueueAdditions.m |   20 -
 CordovaLib/CordovaLib.xcodeproj/project.pbxproj    |  495 +--
 CordovaLib/CordovaLibApp/AppDelegate.h             |    3 +
 CordovaLib/CordovaLibApp/AppDelegate.m             |   30 +-
 CordovaLib/CordovaLibApp/Cordova.plist             |    2 +
 CordovaLib/CordovaLibApp/main.m                    |    7 +-
 CordovaLib/CordovaLibApp/www/index.html            |    2 +
 CordovaLib/CordovaLibTests/CDVBase64Tests.h        |   26 -
 CordovaLib/CordovaLibTests/CDVBase64Tests.m        |    6 +-
 CordovaLib/CordovaLibTests/CDVContactsTests.h      |   31 -
 CordovaLib/CordovaLibTests/CDVContactsTests.m      |   14 +-
 CordovaLib/CordovaLibTests/CDVFakeFileManager.h    |   35 +
 CordovaLib/CordovaLibTests/CDVFakeFileManager.m    |   45 +
 CordovaLib/CordovaLibTests/CDVFileTransferTests.m  |  184 +
 CordovaLib/CordovaLibTests/CDVLocalStorageTests.h  |   26 -
 CordovaLib/CordovaLibTests/CDVLocalStorageTests.m  |  107 +-
 .../CDVPluginResultJSONSerializationTests.h        |   28 -
 .../CDVPluginResultJSONSerializationTests.m        |   20 +-
 CordovaLib/CordovaLibTests/CDVWebViewTest.h        |   20 +-
 CordovaLib/CordovaLibTests/CDVWebViewTest.m        |   96 +-
 CordovaLib/CordovaLibTests/CDVWhitelistTests.h     |   26 -
 CordovaLib/CordovaLibTests/CDVWhitelistTests.m     |    6 +-
 CordovaLib/VERSION                                 |    2 +-
 CordovaLib/javascript/cordova.ios.js               |  195 +-
 FirstRun.md                                        |   56 +
 Makefile                                           |  118 +-
 README.md                                          |   65 +-
 RELEASENOTES.md                                    |  499 ++
 bin/BOOM                                           |   27 -
 bin/README.md                                      |   25 +-
 bin/bench                                          |   48 -
 bin/create                                         |   73 +-
 .../__TESTING__.xcodeproj/TemplateIcon.icns        |  Bin 0 -> 183175 bytes
 .../__TESTING__.xcodeproj/TemplateInfo.plist       |   28 +
 .../project/__TESTING__.xcodeproj/project.pbxproj  |  703 ++-
 bin/templates/project/__TESTING__/.gitignore       |    6 +
 .../project/__TESTING__/Classes/AppDelegate.h      |   11 +-
 .../project/__TESTING__/Classes/AppDelegate.m      |   13 +-
 .../__TESTING__/Classes/MainViewController.h       |   10 +-
 .../__TESTING__/Classes/MainViewController.m       |    5 +-
 bin/templates/project/__TESTING__/Cordova.plist    |    2 +
 .../__TESTING__/CordovaBuildSettings.xcconfig      |   26 +
 .../__TESTING__/Resources/icons/icon-72@2x.png     |  Bin 0 -> 11706 bytes
 .../Resources/splash/Default-Landscape@2x~ipad.png |  Bin 0 -> 1534088 bytes
 .../Resources/splash/Default-Landscape~ipad.png    |  Bin 0 -> 423095 bytes
 .../Resources/splash/Default-Portrait@2x~ipad.png  |  Bin 0 -> 1610434 bytes
 .../Resources/splash/Default-Portrait~ipad.png     |  Bin 0 -> 421667 bytes
 .../project/__TESTING__/__TESTING__-Info.plist     |    2 +-
 .../project/__TESTING__/__TESTING__-Prefix.pch     |   38 +-
 .../project/__TESTING__/en.lproj/InfoPlist.strings |   22 -
 bin/templates/project/__TESTING__/main.m           |    4 +-
 bin/templates/project/__TESTING__/verify.sh        |   31 -
 bin/templates/project/cordova/debug                |   21 +-
 bin/templates/project/cordova/emulate              |   39 +-
 bin/templates/project/cordova/log                  |    9 +-
 bin/templates/project/www/config.xml               |   47 +
 bin/templates/project/www/cordova-1.9.0.js         | 5259 ---------------
 bin/templates/project/www/cordova-2.0.0.js         | 5240 ++++++++++++++
 bin/templates/project/www/css/index.css            |  100 +
 bin/templates/project/www/img/cordova.png          |  Bin 0 -> 19932 bytes
 bin/templates/project/www/index.html               |   82 +-
 bin/templates/project/www/js/index.js              |   20 +
 bin/templates/project/www/res/icon/cordova_128.png |  Bin 0 -> 11401 bytes
 bin/templates/project/www/res/icon/cordova_16.png  |  Bin 0 -> 1699 bytes
 bin/templates/project/www/res/icon/cordova_24.png  |  Bin 0 -> 2215 bytes
 bin/templates/project/www/res/icon/cordova_256.png |  Bin 0 -> 27408 bytes
 bin/templates/project/www/res/icon/cordova_32.png  |  Bin 0 -> 2843 bytes
 bin/templates/project/www/res/icon/cordova_48.png  |  Bin 0 -> 4111 bytes
 bin/templates/project/www/res/icon/cordova_512.png |  Bin 0 -> 39830 bytes
 bin/templates/project/www/res/icon/cordova_64.png  |  Bin 0 -> 5463 bytes
 .../project/www/res/icon/cordova_android_36.png    |  Bin 0 -> 3096 bytes
 .../project/www/res/icon/cordova_android_48.png    |  Bin 0 -> 4090 bytes
 .../project/www/res/icon/cordova_android_72.png    |  Bin 0 -> 6080 bytes
 .../project/www/res/icon/cordova_android_96.png    |  Bin 0 -> 7685 bytes
 .../project/www/res/icon/cordova_bb_80.png         |  Bin 0 -> 7287 bytes
 .../project/www/res/icon/cordova_ios_114.png       |  Bin 0 -> 7869 bytes
 .../project/www/res/icon/cordova_ios_144.png       |  Bin 0 -> 11706 bytes
 .../project/www/res/icon/cordova_ios_57.png        |  Bin 0 -> 3908 bytes
 .../project/www/res/icon/cordova_ios_72.png        |  Bin 0 -> 4944 bytes
 .../www/res/screen/android_hdpi_landscape.png      |  Bin 0 -> 218302 bytes
 .../www/res/screen/android_hdpi_portrait.png       |  Bin 0 -> 222148 bytes
 .../www/res/screen/android_ldpi_landscape.png      |  Bin 0 -> 42616 bytes
 .../www/res/screen/android_ldpi_portrait.png       |  Bin 0 -> 42034 bytes
 .../www/res/screen/android_mdpi_landscape.png      |  Bin 0 -> 92347 bytes
 .../www/res/screen/android_mdpi_portrait.png       |  Bin 0 -> 90555 bytes
 .../www/res/screen/android_xhdpi_landscape.png     |  Bin 0 -> 489604 bytes
 .../www/res/screen/android_xhdpi_portrait.png      |  Bin 0 -> 504508 bytes
 .../www/res/screen/blackberry_transparent_300.png  |  Bin 0 -> 15823 bytes
 .../www/res/screen/blackberry_transparent_400.png  |  Bin 0 -> 11001 bytes
 .../project/www/res/screen/ipad_landscape.png      |  Bin 0 -> 407370 bytes
 .../project/www/res/screen/ipad_portrait.png       |  Bin 0 -> 422441 bytes
 .../www/res/screen/ipad_retina_landscape.png       |  Bin 0 -> 1534088 bytes
 .../www/res/screen/ipad_retina_portrait.png        |  Bin 0 -> 1610434 bytes
 .../project/www/res/screen/iphone_landscape.png    |  Bin 0 -> 92301 bytes
 .../project/www/res/screen/iphone_portrait.png     |  Bin 0 -> 93897 bytes
 .../www/res/screen/iphone_retina_landscape.png     |  Bin 0 -> 339639 bytes
 .../www/res/screen/iphone_retina_portrait.png      |  Bin 0 -> 350593 bytes
 .../www/res/screen/windows_phone_portrait.jpg      |  Bin 0 -> 11483 bytes
 bin/templates/project/www/spec.html                |   50 +
 bin/templates/project/www/spec/helper.js           |   11 +
 bin/templates/project/www/spec/index.js            |   49 +
 bin/test                                           |   27 +-
 guides/Cordova Plugin Upgrade Guide.md             |   33 +
 guides/Create a New Project.webloc                 |    8 +
 195 files changed, 8131 insertions(+), 10016 deletions(-)
----------------------------------------------------------------------



Mime
View raw message