Commit dd1e8dfe authored by Benoit Lavenier's avatar Benoit Lavenier

[fix] fix groups lookup

parent 19710d73
......@@ -26,6 +26,7 @@ If you don't already use nodejs (v5), please follow [prerequisite steps](https:/
```bash
git clone https://github.com/duniter/cesium.git
cd cesium
npm install -g gulp bower@1.8.0 cordova@6.5.0 ionic@1.7.16
npm install
npm start
```
......
......@@ -132,7 +132,7 @@ npm install -g gulp bower@1.8.0 cordova@6.5.0 ionic@1.7.16
Puis pour les dépendances non globales :
```bash
npm installion
npm install
```
> Le processus d'installation peut prendre plusieurs minutes. En effet, il faut télécharger toutes les dépendances de Cesium et même en compiler certaines.
......
......@@ -36,7 +36,7 @@ if (rootdir && !skip) {
var indexPath = path.join(wwwPath, 'index.html');
var jsFilter = filter(["**/*.js", '!**/config.js'], { restore: true });
var jsFilter = filter(["**/*.js", "!**/vendor/*", '!**/config.js'], { restore: true });
var cssFilter = filter("**/*.css", { restore: true });
var revFilesFilter = filter(['**/*', '!**/index.html', '!**/config.js'], { restore: true });
......
......@@ -8,7 +8,7 @@
},
"scripts": {
"postinstall": "bower install",
"install-for-mobile": "ionic state restore",
"install-platforms": "ionic state restore",
"start": "ionic serve"
},
"keywords": [
......@@ -139,4 +139,4 @@
"android"
]
}
}
\ No newline at end of file
}
......@@ -22,10 +22,11 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
echo "new build android version: $3"
case "$1" in
rel|pre)
# Change the version in package.json and test file
sed -i "s/version\": \"$current\"/version\": \"$2\"/g" package.json
sed -i "s/ version=\"[^\"]+\"/ version=\"$2\"/g" config.xml
sed -i "s/ android-versionCode=\"[^\"]+\"/ android-versionCode=\"$3\"/g" config.xml
# Change the version in package.json and test file
sed -i "s/version\": \"$current\"/version\": \"$2\"/g" package.json
currentConfigXmlVersion=`grep -oP "version=\"\d+.\d+.\d+((a|b)[0-9]+)?\"" config.xml | grep -oP "\d+.\d+.\d+((a|b)[0-9]+)?"`
sed -i "s/ version=\"$currentConfigXmlVersion\"/ version=\"$2\"/g" config.xml
sed -i "s/ android-versionCode=\"$currentAndroid\"/ android-versionCode=\"$3\"/g" config.xml
# Bump the install.sh
sed -i "s/echo \"v.*\" #lastest/echo \"v$2\" #lastest/g" install.sh
......
This diff is collapsed.
......@@ -798,9 +798,11 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
var service = new CryptoAbstractService();
var isDevice = true;
// removeIf(device)
// removeIf(android)
// removeIf(ios)
isDevice = false;
// endRemoveIf(device)
// endRemoveIf(ios)
// endRemoveIf(android)
//console.debug("[crypto] Created CryptotUtils service. device=" + isDevice);
......
......@@ -279,7 +279,9 @@ function ESViewEditProfileController($scope, $rootScope, $q, $timeout, $state, $
if (Device.camera.enable) {
return Device.camera.getPicture()
.then(function(imageData) {
if (!imageData) return;
$scope.avatar = {src: "data:image/png;base64," + imageData};
$scope.avatarStyle={'background-image':'url("'+imageData+'")'};
$scope.dirty = true;
})
.catch(UIUtils.onError('ERROR.TAKE_PICTURE_FAILED'));
......
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