Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
2 changed files with 6 additions and 1 deletions
Showing only changes of commit 71cfaff6c8 - Show all commits

View File

@ -33,12 +33,16 @@
</platform> </platform>
<preference name="DisallowOverscroll" value="true" /> <preference name="DisallowOverscroll" value="true" />
<preference name="StatusBarBackgroundColor" value="#212121" /> <preference name="StatusBarBackgroundColor" value="#212121" />
<preference name="CameraUsesGeolocation" value="false" />
<plugin name="cordova-plugin-whitelist" spec="1" /> <plugin name="cordova-plugin-whitelist" spec="1" />
<plugin name="cordova-plugin-device" spec="^1.1.7" /> <plugin name="cordova-plugin-device" spec="^1.1.7" />
<plugin name="cordova-plugin-dialogs" spec="^1.3.4" /> <plugin name="cordova-plugin-dialogs" spec="^1.3.4" />
<plugin name="cordova-plugin-statusbar" spec="^2.3.0" /> <plugin name="cordova-plugin-statusbar" spec="^2.3.0" />
<plugin name="cordova-plugin-ble-central" spec="^1.1.4" />
<plugin name="cordova-plugin-splashscreen" spec="~4.1.0" /> <plugin name="cordova-plugin-splashscreen" spec="~4.1.0" />
<plugin name="cordova-plugin-camera-with-exif" spec="^1.2.2" />
<plugin name="cordova-plugin-ble-central" spec="^1.1.4">
<variable name="BLUETOOTH_USAGE_DESCRIPTION" value="INTVAL intervalometer controls" />
</plugin>
<engine name="android" spec="^6.4.0" /> <engine name="android" spec="^6.4.0" />
<engine name="ios" spec="^4.5.4" /> <engine name="ios" spec="^4.5.4" />
</widget> </widget>

View File

@ -7,3 +7,4 @@ cordova plugin add cordova-plugin-device
cordova plugin add cordova-plugin-dialogs cordova plugin add cordova-plugin-dialogs
cordova plugin add cordova-plugin-ble-central --variable BLUETOOTH_USAGE_DESCRIPTION="INTVAL intervalometer controls" cordova plugin add cordova-plugin-ble-central --variable BLUETOOTH_USAGE_DESCRIPTION="INTVAL intervalometer controls"
cordova plugin add cordova-plugin-statusbar cordova plugin add cordova-plugin-statusbar
cordova plugin add cordova-plugin-camera-with-exif