Skip to content

Commit

Permalink
Merge remote-tracking branch 'mainRepo/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	android/common
#	ios/common
#	package.json
#	plugin.xml
  • Loading branch information
pavelety committed Nov 5, 2018
2 parents 1534df8 + ae034ab commit 1531396
Show file tree
Hide file tree
Showing 5 changed files with 892 additions and 565 deletions.
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ More info: https://github.com/mauron85/react-native-background-geolocation/pull/
Since alpha.46:
- typescript definitions

Since alpha.47:
- allow nested location props in postTemplate

#### Changed
- start and stop methods doesn't accept callback (use event listeners instead)
- for background syncing syncUrl option is required
Expand Down
2 changes: 2 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
* Platform: iOS or Android
* OS version:
* Device manufacturer and model:
<!--- If Simulator was used instead of real device, type Yes in following section -->
* Running in Simulator:
* Cordova version (`cordova -v`):
* Cordova platform version (`cordova platform ls`):
* Plugin configuration options:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-pavelety-background-geolocation",
"version": "3.0.0-alpha.46",
"version": "3.0.0-alpha.47",
"description": "Cordova Background Geolocation Plugin",
"main": "www/BackgroundGeolocation.js",
"cordova": {
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-pavelety-background-geolocation"
version="3.0.0-alpha.46">
version="3.0.0-alpha.47">
<name>CDVBackgroundGeolocation</name>
<description>Cordova Background Geolocation Plugin</description>
<license>Apache-2.0</license>
Expand Down
Loading

0 comments on commit 1531396

Please sign in to comment.