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 9 additions and 2 deletions
Showing only changes of commit e55154e46e - Show all commits

7
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "com.sixteenmillimeter.intval3", "name": "com.sixteenmillimeter.intval3",
"version": "1.0.0", "version": "1.0.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -531,6 +531,11 @@
"resolved": "https://registry.npmjs.org/cordova-plugin-ble-central/-/cordova-plugin-ble-central-1.1.4.tgz", "resolved": "https://registry.npmjs.org/cordova-plugin-ble-central/-/cordova-plugin-ble-central-1.1.4.tgz",
"integrity": "sha1-rZA2mnla1wChuf3WbhnnzkSnicM=" "integrity": "sha1-rZA2mnla1wChuf3WbhnnzkSnicM="
}, },
"cordova-plugin-camera-with-exif": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-camera-with-exif/-/cordova-plugin-camera-with-exif-1.2.2.tgz",
"integrity": "sha1-/kxfHWgga6QoOqtNM4MrVSwil3A="
},
"cordova-plugin-compat": { "cordova-plugin-compat": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/cordova-plugin-compat/-/cordova-plugin-compat-1.2.0.tgz", "resolved": "https://registry.npmjs.org/cordova-plugin-compat/-/cordova-plugin-compat-1.2.0.tgz",

View File

@ -13,6 +13,7 @@
"cordova-android": "^6.4.0", "cordova-android": "^6.4.0",
"cordova-ios": "^4.5.4", "cordova-ios": "^4.5.4",
"cordova-plugin-ble-central": "^1.1.4", "cordova-plugin-ble-central": "^1.1.4",
"cordova-plugin-camera-with-exif": "^1.2.2",
"cordova-plugin-compat": "^1.2.0", "cordova-plugin-compat": "^1.2.0",
"cordova-plugin-device": "^1.1.7", "cordova-plugin-device": "^1.1.7",
"cordova-plugin-dialogs": "^1.3.4", "cordova-plugin-dialogs": "^1.3.4",
@ -29,7 +30,8 @@
"cordova-plugin-ble-central": { "cordova-plugin-ble-central": {
"BLUETOOTH_USAGE_DESCRIPTION": "INTVAL intervalometer controls" "BLUETOOTH_USAGE_DESCRIPTION": "INTVAL intervalometer controls"
}, },
"cordova-plugin-splashscreen": {} "cordova-plugin-splashscreen": {},
"cordova-plugin-camera-with-exif": {}
}, },
"platforms": [ "platforms": [
"android", "android",