Commit 890526bb authored by Benoit Lavenier's avatar Benoit Lavenier

Merge branch 'master' into 'master'

Reverted Android icons and splashscreens, fix barcode scanner

See merge request !602
parents f9f39bb4 ded885df
Pipeline #7292 passed with stages
in 7 minutes and 45 seconds
......@@ -31,7 +31,7 @@
},
"dependencies": {
"cordova": "^9.0.0",
"cordova-android": "6.4.0",
"cordova-android": "^6.4.0",
"cordova-clipboard": "^1.3.0",
"cordova-ios": "git+https://github.com/bpresles/cordova-ios.git#5.1.0",
"cordova-osx": "^5.0.0",
......
......@@ -94,7 +94,7 @@ angular.module("cesium.config", [])
}
},
"version": "1.4.12",
"build": "2019-11-08T20:56:38.011Z",
"build": "2019-11-16T13:39:37.358Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
})
......
......@@ -241,7 +241,7 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
if (exports.enable){
exports.camera.enable = !!navigator.camera;
exports.keyboard.enable = cordova && cordova.plugins && !!cordova.plugins.Keyboard;
exports.barcode.enable = cordova && cordova.plugins && !!cordova.plugins.barcodeScanner && !this.isOSX();
exports.barcode.enable = cordova && cordova.plugins && !!cordova.plugins.barcodeScanner && !exports.isOSX();
exports.clipboard.enable = cordova && cordova.plugins && !!cordova.plugins.clipboard;
if (exports.keyboard.enable) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment