Code

NTP: merge with master#3420

Code

Merged

sqrrm merged 37 commits intobisq-network:release/v1.2.0bisq-network/bisq:release/v1.2.0from ripcurlx:merge-with-masterripcurlx/bisq-desktop:merge-with-masterCopy head branch name to clipboardOct 17, 2019

+488-340

Commits

Commits on Sep 15, 2019

• Temporarily disable onion host for @KanoczTomas's BTC node

  wiz

  committed
  d333520

Commits on Sep 18, 2019

• Add Ergo (ERG) without Bouncy Castle dependency.

  Show description for 047ec4a
  jasondavies

  committed
  047ec4a

Commits on Sep 24, 2019

• List CTSCoin (CTSC)

  cryptogeuse

  committed
  fbd6525

Commits on Sep 27, 2019

• Merge pull request bisq-network#3289 from plutomonkey/ergo

  Show description for 06a28d0
  ripcurlx

  authored
  06a28d0

Commits on Sep 28, 2019

• Tweak the English name of Japan Bank Transfer payment method

  wiz

  committed
  c63c77c

Commits on Sep 30, 2019

• Merge pull request bisq-network#3344 from wiz/tweak-japan-bank-transfer-string

  Show description for 7bed73e
  ripcurlx

  authored
  7bed73e

Commits on Oct 2, 2019

• Add mediator prefix to trade statistics

  chimp1984

  committed
  b1c8141

Commits on Oct 3, 2019

• List Faircoin (FAIR)

  jsalatas

  committed
  406c098

• List uPlexa (UPX)

  QuantumLeaper

  committed
  f5f4611

• Remove not used private methods from BisqEnvironment

  lusarz

  committed
  d20afd6

Commits on Oct 4, 2019

• Merge pull request bisq-network#3354 from jsalatas/faircoin-pr

  Show description for ca1538d
  ripcurlx

  authored
  ca1538d

• Merge pull request bisq-network#3351 from chimp1984/fix-missing-addition-of-mediator

  Show description for 95e9bd4
  ripcurlx

  authored
  95e9bd4

• Merge pull request bisq-network#3350 from QuantumLeaper/list-upx-asset

  Show description for 70d17ea
  ripcurlx

  authored
  70d17ea

• Merge pull request bisq-network#3324 from ctscoin/list-ctsc-asset

  Show description for bae6e7a
  ripcurlx

  authored
  bae6e7a

Commits on Oct 5, 2019

• Add onInitP2pNetwork and onInitWallet to BisqSetupListener

  Show description for b6cc351
  

  ManfredKarrer

  authored and

  Bernard Labno

  committed
  b6cc351

• Start server at onInitWallet and add wallet password handler

  Show description for fb9f59d
  

  ManfredKarrer

  authored and

  Bernard Labno

  committed
  fb9f59d

Commits on Oct 7, 2019

• Merge pull request bisq-network#3263 from wiz/disable-kanocztomas-onion-btcnode

  Show description for 3cfa73a
  ripcurlx

  authored
  3cfa73a

• Merge pull request bisq-network#3348 from blabno/changes-needed-for-minimal-api

  Show description for 560d66b
  ripcurlx

  authored
  560d66b

Commits on Oct 8, 2019

• Add combination (Blockstream.info + Mempool.space) block explorer

  wiz

  committed
  5ecc897

• Revert "Temporarily disable onion host for @KanoczTomas's BTC node"

  Show description for 3c1f8a1
  wiz

  committed
  3c1f8a1

• Temporarily disable KanoczTomas btcnode on both onion and clearnet

  wiz

  committed
  5babcec

Commits on Oct 9, 2019

• Merge pull request bisq-network#3378 from wiz/disable-kanocztomas-btcnode-entirely

  Show description for 0770a78
  ripcurlx

  authored
  0770a78

• Merge pull request bisq-network#3377 from wiz/add-mempool-space-transaction-tracker

  Show description for f3950bd
  ripcurlx

  authored
  f3950bd

• Refactor BisqApp - update scene size calculation

  lusarz

  committed
  a9c2448

• Refactor BisqApp - update error popup message build

  lusarz

  committed
  584e552

• Refactor BisqApp - move icon load into ImageUtil

  lusarz

  committed
  23877d4

• Remove unused Utilities

  lusarz

  committed
  db17fd5

Commits on Oct 10, 2019

• Increase minimum TX fee to 2 sats/vByte to fix bisq-network#3106 (bisq-network#3387)

  

  wiz

  authored and

  sqrrm

  committed
  679985d

• Fix mistakes in English source (bisq-network#3386)

  Show description for ccfbf6f
  ripcurlx

  authored
  ccfbf6f

Commits on Oct 14, 2019

• Merge pull request bisq-network#3383 from lusarz/remove-unused-utilities

  Show description for a5aea5a
  ripcurlx

  authored
  a5aea5a

• Merge pull request bisq-network#3382 from lusarz/refactor-bisq-app-image-util

  Show description for 94b12a7
  ripcurlx

  authored
  94b12a7

• Merge pull request bisq-network#3381 from lusarz/refactor-bisq-app-throwable

  Show description for 4277ec8
  ripcurlx

  authored
  4277ec8

• Refactor BisqEnvironment

  lusarz

  committed
  d8dd014

• Merge pull request bisq-network#3380 from lusarz/refactor-bisq-app-scene-size-calculation

  Show description for aaddda9
  ripcurlx

  authored
  aaddda9

• Merge pull request bisq-network#3363 from lusarz/refactor-bisq-environment-2

  Show description for 57fc862
  ripcurlx

  authored
  57fc862

Commits on Oct 15, 2019

• Merge pull request bisq-network#3362 from lusarz/refactor-bisq-environment

  Show description for 2178dbd
  ripcurlx

  authored
  2178dbd

Commits on Oct 17, 2019

• Merge branch 'master' of github.com:bisq-network/bisq into merge-with-master

  ripcurlx

  committed
  278f567