You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by tr...@apache.org on 2016/01/05 20:20:02 UTC
[2/8] mac commit: Merge branch 'master' into dev
Merge branch 'master' into dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/7c025364
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/7c025364
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/7c025364
Branch: refs/heads/master
Commit: 7c025364035fd0adf10b7fb5943236487f63b664
Parents: b1f4889 2d3d604
Author: Tobias Bocanegra <tr...@adobe.com>
Authored: Mon Nov 16 21:58:33 2015 -0800
Committer: Tobias Bocanegra <tr...@adobe.com>
Committed: Mon Nov 16 21:58:33 2015 -0800
----------------------------------------------------------------------
CordovaLibTests/CDVBase64Tests.m | 64 --
CordovaLibTests/CDVStartPageTests.m | 60 --
CordovaLibTests/CDVWebViewTest.h | 43 --
CordovaLibTests/CDVWebViewTest.m | 125 ----
CordovaLibTests/CordovaLibTests-Info.plist | 22 -
CordovaLibTests/CordovaLibTests-Prefix.pch | 15 -
.../CordovaLibTests.xcodeproj/project.pbxproj | 610 -------------------
CordovaLibTests/TestApp/AppDelegate.h | 32 -
CordovaLibTests/TestApp/AppDelegate.m | 64 --
CordovaLibTests/TestApp/MainViewController.h | 32 -
CordovaLibTests/TestApp/MainViewController.m | 114 ----
CordovaLibTests/TestApp/MainViewController.xib | 169 -----
CordovaLibTests/TestApp/TestApp-Info.plist | 32 -
CordovaLibTests/TestApp/TestApp-Prefix.pch | 9 -
CordovaLibTests/TestApp/config.xml | 29 -
CordovaLibTests/TestApp/en.lproj/Credits.rtf | 29 -
.../TestApp/en.lproj/InfoPlist.strings | 2 -
.../TestApp/en.lproj/MainViewController.strings | 390 ------------
CordovaLibTests/TestApp/main.m | 33 -
CordovaLibTests/TestApp/www/index.html | 84 ---
CordovaLibTests/en.lproj/InfoPlist.strings | 2 -
package.json | 6 +-
tests/.jshintrc | 11 +
tests/CordovaLibTests/CDVBase64Tests.m | 64 ++
tests/CordovaLibTests/CDVStartPageTests.m | 60 ++
tests/CordovaLibTests/CDVWebViewTest.h | 43 ++
tests/CordovaLibTests/CDVWebViewTest.m | 120 ++++
.../CordovaLibTests/CordovaLibApp/AppDelegate.h | 33 +
.../CordovaLibTests/CordovaLibApp/AppDelegate.m | 68 +++
.../CordovaLibApp/CordovaLibApp-Info.plist | 32 +
.../CordovaLibApp/CordovaLibApp-Prefix.pch | 9 +
.../CordovaLibApp/MainViewController.h | 32 +
.../CordovaLibApp/MainViewController.m | 114 ++++
.../CordovaLibApp/MainViewController.xib | 162 +++++
tests/CordovaLibTests/CordovaLibApp/config.xml | 29 +
.../CordovaLibApp/en.lproj/Credits.rtf | 29 +
.../CordovaLibApp/en.lproj/InfoPlist.strings | 2 +
.../en.lproj/MainViewController.strings | 390 ++++++++++++
tests/CordovaLibTests/CordovaLibApp/main.m | 33 +
.../CordovaLibApp/www/index.html | 84 +++
.../CordovaLibTests/CordovaLibTests-Info.plist | 22 +
.../CordovaLibTests/CordovaLibTests-Prefix.pch | 15 +
.../CordovaLibTests.xcodeproj/project.pbxproj | 589 ++++++++++++++++++
.../CordovaLibTests/en.lproj/InfoPlist.strings | 2 +
tests/spec/cordovalib.spec.js | 55 ++
tests/spec/create.spec.js | 72 +++
46 files changed, 2074 insertions(+), 1962 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org