You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/12/06 23:23:46 UTC
[5/18] ios commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cordova-ios
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/46f0992b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/46f0992b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/46f0992b
Branch: refs/heads/master
Commit: 46f0992bf6c6b882b862fd73bff92bf903e12df5
Parents: 8656d6a e7b16f4
Author: purplecabbage <pu...@gmail.com>
Authored: Tue Oct 2 13:45:49 2012 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Tue Oct 2 13:45:49 2012 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVFileTransfer.m | 3 +-
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 19 -
CordovaLib/CordovaLibApp/AppDelegate.h | 33 -
CordovaLib/CordovaLibApp/AppDelegate.m | 108 -
CordovaLib/CordovaLibApp/Cordova.plist | 69 -
CordovaLib/CordovaLibApp/CordovaLibApp-Info.plist | 45 -
CordovaLib/CordovaLibApp/CordovaLibApp-Prefix.pch | 35 -
CordovaLib/CordovaLibApp/ViewController.h | 25 -
CordovaLib/CordovaLibApp/ViewController.m | 54 -
.../CordovaLibApp/en.lproj/InfoPlist.strings | 20 -
CordovaLib/CordovaLibApp/main.m | 29 -
CordovaLib/CordovaLibApp/www/index.html | 84 -
CordovaLib/CordovaLibTests/CDVBase64Tests.m | 64 -
CordovaLib/CordovaLibTests/CDVContactsTests.m | 60 -
CordovaLib/CordovaLibTests/CDVFakeFileManager.h | 35 -
CordovaLib/CordovaLibTests/CDVFakeFileManager.m | 49 -
CordovaLib/CordovaLibTests/CDVFileTransferTests.m | 217 -
.../CordovaLibTests/CDVInvokedUrlCommandTests.m | 96 -
CordovaLib/CordovaLibTests/CDVLocalStorageTests.m | 146 -
.../CDVPluginResultJSONSerializationTests.m | 146 -
CordovaLib/CordovaLibTests/CDVWebViewTest.h | 42 -
CordovaLib/CordovaLibTests/CDVWebViewTest.m | 123 -
CordovaLib/CordovaLibTests/CDVWhitelistTests.m | 248 -
.../CordovaLibTests/CordovaLibTests-Info.plist | 42 -
.../CordovaLibTests/CordovaLibTests-Prefix.pch | 25 -
.../CordovaLibTests/en.lproj/InfoPlist.strings | 20 -
CordovaLib/CordovaTests.xcodeproj/project.pbxproj | 684 --
.../xcshareddata/xcschemes/CordovaLibApp.xcscheme | 95 -
.../xcschemes/CordovaLibTests.xcscheme | 52 -
CordovaLib/Makefile | 47 -
CordovaLib/javascript/cordova.ios.js | 6072 ---------------
CordovaLibTests/CDVBase64Tests.m | 64 +
CordovaLibTests/CDVContactsTests.m | 60 +
CordovaLibTests/CDVFakeFileManager.h | 35 +
CordovaLibTests/CDVFakeFileManager.m | 43 +
CordovaLibTests/CDVFileTransferTests.m | 213 +
CordovaLibTests/CDVInvokedUrlCommandTests.m | 96 +
CordovaLibTests/CDVLocalStorageTests.m | 146 +
.../CDVPluginResultJSONSerializationTests.m | 146 +
CordovaLibTests/CDVWebViewTest.h | 43 +
CordovaLibTests/CDVWebViewTest.m | 122 +
CordovaLibTests/CDVWhitelistTests.m | 248 +
CordovaLibTests/CordovaLibApp/AppDelegate.h | 33 +
CordovaLibTests/CordovaLibApp/AppDelegate.m | 104 +
CordovaLibTests/CordovaLibApp/Cordova.plist | 71 +
.../CordovaLibApp/CordovaLibApp-Info.plist | 45 +
CordovaLibTests/CordovaLibApp/ViewController.h | 25 +
CordovaLibTests/CordovaLibApp/ViewController.m | 54 +
.../CordovaLibApp/en.lproj/InfoPlist.strings | 20 +
CordovaLibTests/CordovaLibApp/main.m | 29 +
CordovaLibTests/CordovaLibApp/www/index.html | 84 +
CordovaLibTests/CordovaLibTests-Info.plist | 42 +
.../CordovaTests.xcodeproj/project.pbxproj | 678 ++
.../xcshareddata/xcschemes/CordovaLibApp.xcscheme | 95 +
.../xcschemes/CordovaLibTests.xcscheme | 62 +
CordovaLibTests/en.lproj/InfoPlist.strings | 20 +
Makefile | 4 +-
bin/create | 9 +-
bin/update_cordova_subproject | 11 +-
hooks/pre-commit | 3 +-
60 files changed, 2598 insertions(+), 8794 deletions(-)
----------------------------------------------------------------------