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 2014/08/07 22:22:49 UTC
[06/14] git commit: Merge branch 'master' into cdvtest
Merge branch 'master' into cdvtest
Conflicts:
test/manual.html
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/commit/3a0ddee9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/tree/3a0ddee9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/diff/3a0ddee9
Branch: refs/heads/master
Commit: 3a0ddee985dc57e9088b7844bffbf02688d418ef
Parents: b3ab710 1ac2200
Author: Michal Mocny <mm...@gmail.com>
Authored: Mon May 5 12:12:42 2014 -0400
Committer: Michal Mocny <mm...@gmail.com>
Committed: Mon May 5 12:12:42 2014 -0400
----------------------------------------------------------------------
CONTRIBUTING.md | 16 ++
NOTICE | 5 +
README.md | 25 ++-
RELEASENOTES.md | 30 ++-
doc/index.md | 279 ++++++++++++++++++++++++++
docs/Coordinates/coordinates.md | 127 ------------
docs/Position/position.md | 121 -----------
docs/PositionError/positionError.md | 59 ------
docs/geolocation.clearWatch.md | 119 -----------
docs/geolocation.getCurrentPosition.md | 128 ------------
docs/geolocation.md | 104 ----------
docs/geolocation.watchPosition.md | 130 ------------
docs/parameters/geolocation.options.md | 41 ----
docs/parameters/geolocationError.md | 32 ---
docs/parameters/geolocationSuccess.md | 46 -----
plugin.xml | 103 +++++++++-
src/amazon/CordovaLocationListener.java | 252 +++++++++++++++++++++++
src/amazon/GPSListener.java | 51 +++++
src/amazon/GeoBroker.java | 205 +++++++++++++++++++
src/amazon/NetworkListener.java | 33 +++
src/android/CordovaLocationListener.java | 251 -----------------------
src/android/GPSListener.java | 51 -----
src/android/GeoBroker.java | 204 -------------------
src/android/NetworkListener.java | 33 ---
src/blackberry10/index.js | 64 ------
src/firefoxos/GeolocationProxy.js | 53 +++--
src/ios/CDVLocation.m | 2 +-
src/ubuntu/geolocation.cpp | 119 +++++++++++
src/ubuntu/geolocation.h | 69 +++++++
src/windows8/GeolocationProxy.js | 163 +++++++++++++++
test/.DS_Store | Bin 6148 -> 0 bytes
test/manual.html | 169 ----------------
www/blackberry10/GeolocationProxy.js | 69 +++++++
33 files changed, 1438 insertions(+), 1715 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/blob/3a0ddee9/plugin.xml
----------------------------------------------------------------------