cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [32/50] [abbrv] git commit: merging multiples
Date Wed, 17 Oct 2012 23:27:01 GMT
merging multiples


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-windows/commit/f072a9cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-windows/tree/f072a9cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-windows/diff/f072a9cc

Branch: refs/heads/master
Commit: f072a9ccab6fe2eb92e85e52c8f60ec91c672369
Parents: ad5b6ae 1874f78
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Wed Oct 17 15:05:56 2012 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Wed Oct 17 15:05:56 2012 -0700

----------------------------------------------------------------------
 .gitignore                                         |    1 +
 README.md                                          |    1 +
 test/MetroTestApp/MetroTestApp.jsproj              |  135 +
 test/MetroTestApp/MetroTestApp.jsproj.user         |   11 +
 test/MetroTestApp/MetroTestApp.sln                 |   46 +
 test/MetroTestApp/MetroTestApp_TemporaryKey.pfx    |  Bin 0 -> 2504 bytes
 test/MetroTestApp/accelerometer/index.html         |  139 +
 test/MetroTestApp/audio/index.html                 |  395 ++
 test/MetroTestApp/autotest/html/HtmlReporter.js    |  101 +
 .../autotest/html/HtmlReporterHelpers.js           |   60 +
 test/MetroTestApp/autotest/html/ReporterView.js    |  164 +
 test/MetroTestApp/autotest/html/SpecView.js        |   79 +
 test/MetroTestApp/autotest/html/SuiteView.js       |   22 +
 test/MetroTestApp/autotest/html/TrivialReporter.js |  192 +
 test/MetroTestApp/autotest/index.html              |   34 +
 test/MetroTestApp/autotest/jasmine.css             |   81 +
 test/MetroTestApp/autotest/jasmine.js              | 2530 +++++++++++
 .../MetroTestApp/autotest/pages/accelerometer.html |   49 +
 test/MetroTestApp/autotest/pages/all.html          |   98 +
 test/MetroTestApp/autotest/pages/battery.html      |   44 +
 test/MetroTestApp/autotest/pages/camera.html       |   49 +
 test/MetroTestApp/autotest/pages/capture.html      |   50 +
 test/MetroTestApp/autotest/pages/compass.html      |   49 +
 test/MetroTestApp/autotest/pages/contacts.html     |   49 +
 test/MetroTestApp/autotest/pages/device.html       |   49 +
 test/MetroTestApp/autotest/pages/file.html         |   68 +
 test/MetroTestApp/autotest/pages/filetransfer.html |   69 +
 test/MetroTestApp/autotest/pages/geolocation.html  |   49 +
 test/MetroTestApp/autotest/pages/media.html        |   49 +
 test/MetroTestApp/autotest/pages/network.html      |   49 +
 test/MetroTestApp/autotest/pages/notification.html |   49 +
 test/MetroTestApp/autotest/pages/platform.html     |   49 +
 test/MetroTestApp/autotest/pages/storage.html      |   49 +
 test/MetroTestApp/autotest/test-runner.js          |    9 +
 .../autotest/tests/accelerometer.tests.js          |  193 +
 test/MetroTestApp/autotest/tests/battery.tests.js  |    5 +
 test/MetroTestApp/autotest/tests/camera.tests.js   |   47 +
 test/MetroTestApp/autotest/tests/capture.tests.js  |   95 +
 test/MetroTestApp/autotest/tests/compass.tests.js  |   76 +
 test/MetroTestApp/autotest/tests/contacts.tests.js |  451 ++
 test/MetroTestApp/autotest/tests/device.tests.js   |   34 +
 test/MetroTestApp/autotest/tests/file.tests.js     | 3462 +++++++++++++++
 .../autotest/tests/filetransfer.tests.js           |  407 ++
 .../autotest/tests/geolocation.tests.js            |  142 +
 test/MetroTestApp/autotest/tests/media.tests.js    |  144 +
 test/MetroTestApp/autotest/tests/network.tests.js  |   25 +
 .../autotest/tests/notification.tests.js           |   20 +
 test/MetroTestApp/autotest/tests/platform.tests.js |   35 +
 test/MetroTestApp/autotest/tests/storage.tests.js  |  161 +
 test/MetroTestApp/battery/index.html               |   97 +
 .../Debug/MetroTestApp.jsproj.FileListAbsolute.txt |   13 +
 .../bld/Debug/ProjectArchitectures.txt             |    1 +
 test/MetroTestApp/bld/Debug/layout.resfiles        |   67 +
 .../bld/Debug/layout.resfiles.intermediate         |   67 +
 test/MetroTestApp/bld/Debug/priconfig.xml          |   24 +
 .../bld/Debug/priconfig.xml.intermediate           |   24 +
 test/MetroTestApp/camera/index.html                |   98 +
 test/MetroTestApp/compass/index.html               |  129 +
 test/MetroTestApp/contacts/index.html              |  113 +
 test/MetroTestApp/cordova.js                       |   16 +
 test/MetroTestApp/css/default.css                  |   14 +
 test/MetroTestApp/default.html                     |   20 +
 test/MetroTestApp/default.js                       |   46 +
 test/MetroTestApp/events/index.html                |   89 +
 test/MetroTestApp/images/logo.png                  |  Bin 0 -> 801 bytes
 test/MetroTestApp/images/smalllogo.png             |  Bin 0 -> 329 bytes
 test/MetroTestApp/images/splashscreen.png          |  Bin 0 -> 2146 bytes
 test/MetroTestApp/images/storelogo.png             |  Bin 0 -> 429 bytes
 test/MetroTestApp/index.html                       |   38 +
 test/MetroTestApp/location/index.html              |  154 +
 test/MetroTestApp/main.js                          |  140 +
 test/MetroTestApp/master.css                       |  131 +
 test/MetroTestApp/misc/index.html                  |   60 +
 test/MetroTestApp/misc/page2.html                  |   26 +
 test/MetroTestApp/network/index.html               |   60 +
 test/MetroTestApp/notification/index.html          |   82 +
 test/MetroTestApp/package.appxmanifest             |   36 +
 test/MetroTestApp/sql/index.html                   |  133 +
 test/MetroTestApp/storage/index.html               |   53 +
 79 files changed, 11896 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-windows/blob/f072a9cc/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 97076d0,1f4e47b..beb24b7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,9 -1,46 +1,10 @@@
 -# Shamelessly stolen from http://gist.github.com/114476
 -# .gitignore for .NET projects
 -# Thanks to Derick Bailey
 -# http://www.lostechies.com/blogs/derickbailey/archive/2009/05/18/a-net-c-developer-s-gitignore-file.aspx
 -# Additional Thanks to
 -# - Alexey Abramov
 - 
 -# Standard VS.NET and ReSharper Foo
 -obj
 +*.user
 +.DS_Store
 +bld
  bin
 -Bin
 -*.csproj.user
 +*.opensdf
  *.suo
 -*.cache
 -Thumbs.db
 -
 - 
 -# Other useful stuff
 -*.bak
 -*.cache
 -*.log
 -*.swp
 -*.user
 -_compareTemp
 -_notes
 -aspnet_client
 -httpd.parse.errors
 - 
 -# Office Temp Files
 -~$*
 - 
 -# If you have a deploy folder
 -# deploy
 -# deploy/*
 - 
 -# Exclude ALL DLLs? (
 -# *.dll
 -
 -*.DS_Store
 -
 -
 -CordovaSourceDictionary.xml
 -
 -
 -
 - 
 +*.sdf
 +Debug
 +obj
++Thumbs.db

http://git-wip-us.apache.org/repos/asf/incubator-cordova-windows/blob/f072a9cc/README.md
----------------------------------------------------------------------
diff --cc README.md
index 523d07a,6a58088..e9de5b2
--- a/README.md
+++ b/README.md
@@@ -1,4 -1,2 +1,5 @@@
 -cordova-windows-8
 -=================
 +# Apache Cordova for Windows
 +===
 +
 +This repo may eventually hold, Windows8, Windows7, Win32, win.net, or other windows desktop
related implementations of the Apache Cordova API.
++


Mime
View raw message