Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D512110DC for ; Tue, 20 May 2014 18:50:53 +0000 (UTC) Received: (qmail 3702 invoked by uid 500); 20 May 2014 18:50:53 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 3628 invoked by uid 500); 20 May 2014 18:50:53 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 3606 invoked by uid 99); 20 May 2014 18:50:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2014 18:50:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E6691938C6B; Tue, 20 May 2014 18:50:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zalun@apache.org To: commits@cordova.apache.org Date: Tue, 20 May 2014 18:50:58 -0000 Message-Id: <66dda6768f504a29bfa822752d577e51@git.apache.org> In-Reply-To: <67cf0204289a420cb868c384cbd59804@git.apache.org> References: <67cf0204289a420cb868c384cbd59804@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation 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/48af4c4d Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/tree/48af4c4d Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/diff/48af4c4d Branch: refs/heads/master Commit: 48af4c4d9f5d9e11304be58e0f509c57bff409f1 Parents: cb3612c 1ac2200 Author: Piotr Zalewa Authored: Tue May 20 20:48:38 2014 +0200 Committer: Piotr Zalewa Committed: Tue May 20 20:48:38 2014 +0200 ---------------------------------------------------------------------- CONTRIBUTING.md | 16 + NOTICE | 5 + RELEASENOTES.md | 12 + doc/index.md | 11 + plugin.xml | 74 +- src/android/CordovaLocationListener.java | 251 --- src/android/GPSListener.java | 50 - src/android/GeoBroker.java | 205 -- src/android/NetworkListener.java | 33 - src/ios/CDVLocation.m | 2 +- src/ubuntu/geolocation.cpp | 119 ++ src/ubuntu/geolocation.h | 69 + src/windows8/GeolocationProxy.js | 2 +- test/.DS_Store | Bin 6148 -> 0 bytes test/autotest/html/HtmlReporter.js | 101 - test/autotest/html/HtmlReporterHelpers.js | 60 - test/autotest/html/ReporterView.js | 164 -- test/autotest/html/SpecView.js | 79 - test/autotest/html/SuiteView.js | 22 - test/autotest/html/TrivialReporter.js | 192 -- test/autotest/index.html | 59 - test/autotest/jasmine.css | 81 - test/autotest/jasmine.js | 2530 ------------------------ test/autotest/pages/.DS_Store | Bin 6148 -> 0 bytes test/autotest/pages/geolocation.html | 71 - test/autotest/test-runner.js | 62 - test/autotest/tests/.DS_Store | Bin 6148 -> 0 bytes test/autotest/tests/geolocation.tests.js | 140 -- test/cordova-incl.js | 72 - test/index.html | 65 - test/location/index.html | 169 -- test/main.js | 163 -- test/master.css | 164 -- www/blackberry10/GeolocationProxy.js | 34 +- 34 files changed, 301 insertions(+), 4776 deletions(-) ----------------------------------------------------------------------