diff --git a/appveyor.yml b/appveyor.yml index 4741bf397a677565c81440b4b0e10f9db290bbec..7b93e58737278786811fda701189e596193c7a9b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -74,7 +74,7 @@ artifacts: name: Duniter deploy: - release: v1.1.0 + release: v1.2.0 provider: GitHub auth_token: secure: Vp/M0r0i1yhGR2nhrPWEbTiDIF6r0cmwbNDFZUzdFe5clWxPXtuC0lgIpOQI78zt diff --git a/ci/travis/before_deploy.sh b/ci/travis/before_deploy.sh index ffb9dc5df6ee29a863c9df9c9039faa2454e2dc0..7c1e08df5da32a94fb4e6d3e1ce4229aed87b439 100755 --- a/ci/travis/before_deploy.sh +++ b/ci/travis/before_deploy.sh @@ -7,7 +7,7 @@ if [[ ! -f before_deploy ]]; then # Prepare NVER=`node -v` - DUNITER_VER=1.1.0 + DUNITER_VER=1.2.0 DUNITER_DEB_VER=" $DUNITER_VER" ADDON_VERSION=48 NW_VERSION=0.17.6 diff --git a/ci/travis/debian/DEBIAN/control b/ci/travis/debian/DEBIAN/control index 7d6112917d7bab246057de69bdc8f0a96305dcdc..c437572d24d920330ce670b5a2fc070295b5e73d 100644 --- a/ci/travis/debian/DEBIAN/control +++ b/ci/travis/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: duniter -Version: 1.1.0 +Version: 1.2.0 Section: misc Priority: optional Architecture: all diff --git a/gui/index.html b/gui/index.html index bffcc0233de6a783582c5938d2a309560b50938b..9e5533d7784f474822af14350a92cca6251ce7e7 100644 --- a/gui/index.html +++ b/gui/index.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <title>Duniter 1.1.0</title> + <title>Duniter 1.2.0</title> <style> html { font-family: "Courier New", Courier, monospace; diff --git a/gui/package.json b/gui/package.json index 96c27437c880db541fe40f1c22014e8ba9adcf15..4d54944fd08bd713af6b698f134d369f467a7b20 100644 --- a/gui/package.json +++ b/gui/package.json @@ -1,10 +1,10 @@ { - "name": "v1.1.0", + "name": "v1.2.0", "main": "index.html", "node-main": "../sources/bin/duniter", "window": { "icon": "duniter.png", - "title": "v1.1.0", + "title": "v1.2.0", "width": 800, "height": 800, "min_width": 750, diff --git a/install.sh b/install.sh index 0b1edbc938e3f2bc45b51de8d989bbc22026a7f1..be8e53169bde7aaf74c8daada41c552da86e9944 100755 --- a/install.sh +++ b/install.sh @@ -11,7 +11,7 @@ if [ -z "$DUNITER_DIR" ]; then fi latest_version() { - echo "v1.1.0" + echo "v1.2.0" } repo_url() { diff --git a/package.json b/package.json index ce1a817029cd81d3339a074dedfc6b0c301e6b41..27aec7a8a0f2ec54778cae7a225ae141b1e2d7d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "duniter", - "version": "1.1.0", + "version": "1.2.0", "engines": { "node": ">=4.2.0", "npm": ">=2.11" diff --git a/test/integration/branches.js b/test/integration/branches.js index 710fd853c7c310eef1676579a19b71d0e4bd25c8..c1f1dd6120fa9f745723593b7f79d051e961e2b0 100644 --- a/test/integration/branches.js +++ b/test/integration/branches.js @@ -43,7 +43,7 @@ describe("Branches", () => co(function*() { it('should have a 3 blocks fork window size', function() { return expectAnswer(rp('http://127.0.0.1:7778/node/summary', { json: true }), function(res) { res.should.have.property('duniter').property('software').equal('duniter'); - res.should.have.property('duniter').property('version').equal('1.1.0'); + res.should.have.property('duniter').property('version').equal('1.2.0'); res.should.have.property('duniter').property('forkWindowSize').equal(3); }); });