Commit b5a2f1bb authored by Benoit Lavenier's avatar Benoit Lavenier

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	www/js/config.js
parents d171b447 5d00b49f
<?xml version='1.0' encoding='utf-8'?>
<widget android-versionCode="620" id="fr.gchange" version="0.6.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget android-versionCode="630" id="fr.gchange" version="0.6.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>ğchange</name>
<description>
An unhosted webapp for market with libre currency
......
......@@ -15,7 +15,7 @@ if [ "_$GCHANGE_DIR" = "_" ]; then
fi
latest_version() {
echo "v0.6.2" #lastest
echo "v0.6.3" #lastest
}
api_release_url() {
......
{
"name": "gchange-client",
"version": "0.6.2",
"version": "0.6.3",
"description": "Unhosted webapp client for Duniter network",
"repository": {
"type": "git",
......
......@@ -2,7 +2,7 @@
"short_name": "ğchange",
"name": "ğchange",
"manifest_version": 2,
"version": "0.6.2",
"version": "0.6.3",
"default_locale": "fr",
"description": "A market place for Ğ1 libre currency",
"icons": [
......
......@@ -424,7 +424,7 @@ function ESMessageViewController($scope, $state, $timeout, $translate, $ionicHis
return $scope.loadWallet({minData: true})
.then(function() {
return esMessage.get({type: type, id: id});
return esMessage.get(id, {type: type});
})
.catch(UIUtils.onError('MESSAGE.ERROR.LOAD_MESSAGE_FAILED'))
.then(function(message) {
......
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