Merge branch '1.2'

5b92b38e · Cédric Moreau · 1eb37f41 · 29238da4 · 5b92b38e · 5b92b38e
Commit 5b92b38e authored 8 years ago by Cédric Moreau
--- 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.2.2</title>
+  <title>Duniter 1.2.3</title>
  <style>
    html {
      font-family: "Courier New", Courier, monospace;

--- a/gui/package.json
+++ b/gui/package.json
 {
-  "name": "v1.2.2",
+  "name": "v1.2.3",
  "main": "index.html",
  "node-main": "../sources/bin/duniter",
  "window": {
    "icon": "duniter.png",
-    "title": "v1.2.2",
+    "title": "v1.2.3",
    "width": 800,
    "height": 800,
    "min_width": 750,

--- a/install.sh
+++ b/install.sh
@@ -11,7 +11,7 @@ if [ -z "$DUNITER_DIR" ]; then
 fi

 latest_version() {
-  echo "v1.2.2"
+  echo "v1.2.3"
 }

 repo_url() {

--- a/package.json
+++ b/package.json
 {
  "name": "duniter",
-  "version": "1.2.2",
+  "version": "1.2.3",
  "engines": {
    "node": ">=4.2.0",
    "npm": ">=2.11"
@@ -70,10 +70,10 @@
  },
  "devDependencies": {
    "coveralls": "2.11.4",
-    "duniter-bma": "^1.1.0",
-    "duniter-crawler": "^1.1.0",
-    "duniter-keypair": "^1.1.0",
-    "duniter-prover": "^1.1.0",
+    "duniter-bma": "^1.1.2",
+    "duniter-crawler": "^1.1.3",
+    "duniter-keypair": "^1.1.3",
+    "duniter-prover": "^1.1.2",
    "eslint": "3.13.1",
    "eslint-plugin-mocha": "4.8.0",
    "istanbul": "0.4.0",

--- a/release/arch/debian/package/DEBIAN/control
+++ b/release/arch/debian/package/DEBIAN/control
 Package: duniter
-Version: 1.2.2
+Version: 1.2.3
 Section: misc
 Priority: optional
 Architecture: all

--- 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.2.2');
+        res.should.have.property('duniter').property('version').equal('1.2.3');
        res.should.have.property('duniter').property('forkWindowSize').equal(3);
      });
    });

--- a/yarn.lock
+++ b/yarn.lock
@@ -710,9 +710,9 @@ doctrine@^1.2.2:
    esutils "^2.0.2"
    isarray "^1.0.0"

-duniter-bma@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/duniter-bma/-/duniter-bma-1.1.0.tgz#48ac17d150043dabfc0a0be069c5a45528f938aa"
+duniter-bma@^1.1.0, duniter-bma@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/duniter-bma/-/duniter-bma-1.1.2.tgz#179e24e70d7dcfcedebdc26a211e42ce1714bf4c"
  dependencies:
    async "2.2.0"
    body-parser "1.17.1"
@@ -734,17 +734,17 @@ duniter-bma@^1.1.0:
    ws "1.1.1"

 duniter-common@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/duniter-common/-/duniter-common-1.0.0.tgz#d11b8cb9296e2d29943f2969b1c9291fec8d4d3d"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/duniter-common/-/duniter-common-1.0.1.tgz#a768503c1ee2ceca89c5e5314692d79f64aeb949"
  dependencies:
    co "4.6.0"
    naclb "1.3.7"
    node-pre-gyp "0.6.32"
    tweetnacl "0.14.3"

-duniter-crawler@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/duniter-crawler/-/duniter-crawler-1.1.2.tgz#ca57504355f53333c4f9ae27069af825c0ef0f6e"
+duniter-crawler@^1.1.0, duniter-crawler@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/duniter-crawler/-/duniter-crawler-1.1.3.tgz#a826268a70b02b4aadd74002bc05dfdb93b6d91f"
  dependencies:
    async "2.2.0"
    co "4.6.0"
@@ -757,9 +757,9 @@ duniter-crawler@^1.1.0:
    request-promise "4.2.0"
    underscore "1.8.3"

-duniter-keypair@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/duniter-keypair/-/duniter-keypair-1.1.0.tgz#e4f359a54d40f1f5b615784bf1e6b14ca144b252"
+duniter-keypair@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/duniter-keypair/-/duniter-keypair-1.1.3.tgz#2ed198e6097ad2ce5c929760cfe568a64137f90e"
  dependencies:
    bs58 "4.0.0"
    co "4.6.0"
@@ -771,9 +771,9 @@ duniter-keypair@^1.1.0:
    tweetnacl "0.14.5"
    tweetnacl-util "0.15.0"

-duniter-prover@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/duniter-prover/-/duniter-prover-1.1.0.tgz#0dbde8ea7e6458cca697b9e7e98839d460e8be41"
+duniter-prover@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/duniter-prover/-/duniter-prover-1.1.2.tgz#9b445ea074099b8d819c213ea4b42db035541a1e"
  dependencies:
    async "2.2.0"
    co "4.6.0"