Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ac986e874f
|
@ -30,7 +30,6 @@
|
||||||
<icon height="120" src="res/icon/ios/icon-60@2x.png" width="120" />
|
<icon height="120" src="res/icon/ios/icon-60@2x.png" width="120" />
|
||||||
<icon height="60" src="res/icon/ios/icon-60.png" width="60" />
|
<icon height="60" src="res/icon/ios/icon-60.png" width="60" />
|
||||||
<splash src="res/screen/ios/Default@2x~universal~anyany.png" />
|
<splash src="res/screen/ios/Default@2x~universal~anyany.png" />
|
||||||
<preference name="APPCENTER_APP_SECRET" value="d9cbb435-e432-43d3-ae20-747fccbc8190" />
|
|
||||||
</platform>
|
</platform>
|
||||||
<preference name="DisallowOverscroll" value="true" />
|
<preference name="DisallowOverscroll" value="true" />
|
||||||
<preference name="StatusBarBackgroundColor" value="#212121" />
|
<preference name="StatusBarBackgroundColor" value="#212121" />
|
||||||
|
@ -44,8 +43,6 @@
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
|
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
|
||||||
<plugin name="cordova-plugin-camera-with-exif" spec="^1.2.4" />
|
<plugin name="cordova-plugin-camera-with-exif" spec="^1.2.4" />
|
||||||
<plugin name="cordova-plugin-appcenter-analytics" spec="^0.2.2" />
|
|
||||||
<plugin name="cordova-plugin-appcenter-crashes" spec="^0.2.2" />
|
|
||||||
<engine name="android" spec="^6.4.0" />
|
<engine name="android" spec="^6.4.0" />
|
||||||
<engine name="ios" spec="^4.5.5" />
|
<engine name="ios" spec="^4.5.5" />
|
||||||
</widget>
|
</widget>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "com.sixteenmillimeter.intval3",
|
"name": "com.sixteenmillimeter.intval3",
|
||||||
"version": "1.0.3",
|
"version": "1.0.4",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -512,21 +512,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cordova-plugin-appcenter-analytics": {
|
|
||||||
"version": "0.2.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/cordova-plugin-appcenter-analytics/-/cordova-plugin-appcenter-analytics-0.2.2.tgz",
|
|
||||||
"integrity": "sha512-qCBrDuWiBcyLgG6jfva7tB3fXzQI7yral5sM9tFxRSYmo9gTUeKWYOHs+Eh01RMtehxtwmnhAgZY5/kj3EhNWg=="
|
|
||||||
},
|
|
||||||
"cordova-plugin-appcenter-crashes": {
|
|
||||||
"version": "0.2.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/cordova-plugin-appcenter-crashes/-/cordova-plugin-appcenter-crashes-0.2.2.tgz",
|
|
||||||
"integrity": "sha512-BxFaSLHmt03CR7g39a2AiInm6xrVI3qYF5B7qw8zemK+mEuAlRBeRR0RsGdnZWW/4mQKhHTA09F8k9KyXhh2gQ=="
|
|
||||||
},
|
|
||||||
"cordova-plugin-appcenter-shared": {
|
|
||||||
"version": "0.2.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/cordova-plugin-appcenter-shared/-/cordova-plugin-appcenter-shared-0.2.2.tgz",
|
|
||||||
"integrity": "sha512-f54lGj/swyEyZQD2IagcOPNUhKjvFsUvrIpBvAOHpWXg4fpScg+MK388MlAJC1Bhzhujs9Oo0VtG4/Z8i1fxwg=="
|
|
||||||
},
|
|
||||||
"cordova-plugin-ble-central": {
|
"cordova-plugin-ble-central": {
|
||||||
"version": "1.2.2",
|
"version": "1.2.2",
|
||||||
"resolved": "https://registry.npmjs.org/cordova-plugin-ble-central/-/cordova-plugin-ble-central-1.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/cordova-plugin-ble-central/-/cordova-plugin-ble-central-1.2.2.tgz",
|
||||||
|
|
|
@ -12,9 +12,6 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"cordova-android": "^6.4.0",
|
"cordova-android": "^6.4.0",
|
||||||
"cordova-ios": "^4.5.5",
|
"cordova-ios": "^4.5.5",
|
||||||
"cordova-plugin-appcenter-analytics": "^0.2.2",
|
|
||||||
"cordova-plugin-appcenter-crashes": "^0.2.2",
|
|
||||||
"cordova-plugin-appcenter-shared": "^0.2.2",
|
|
||||||
"cordova-plugin-ble-central": "^1.2.2",
|
"cordova-plugin-ble-central": "^1.2.2",
|
||||||
"cordova-plugin-camera-with-exif": "^1.2.4",
|
"cordova-plugin-camera-with-exif": "^1.2.4",
|
||||||
"cordova-plugin-compat": "^1.2.0",
|
"cordova-plugin-compat": "^1.2.0",
|
||||||
|
@ -34,9 +31,7 @@
|
||||||
"BLUETOOTH_USAGE_DESCRIPTION": "INTVAL3 intervalometer controls"
|
"BLUETOOTH_USAGE_DESCRIPTION": "INTVAL3 intervalometer controls"
|
||||||
},
|
},
|
||||||
"cordova-plugin-splashscreen": {},
|
"cordova-plugin-splashscreen": {},
|
||||||
"cordova-plugin-camera-with-exif": {},
|
"cordova-plugin-camera-with-exif": {}
|
||||||
"cordova-plugin-appcenter-analytics": {},
|
|
||||||
"cordova-plugin-appcenter-crashes": {}
|
|
||||||
},
|
},
|
||||||
"platforms": [
|
"platforms": [
|
||||||
"android",
|
"android",
|
||||||
|
|
Loading…
Reference in New Issue