[bisq-network/bisq] NTP: merge with master (#3420)
Christoph Atteneder
notifications at github.com
Thu Oct 17 13:36:05 UTC 2019
You can view, comment on, or merge this pull request online at:
https://github.com/bisq-network/bisq/pull/3420
-- Commit Summary --
* Temporarily disable onion host for @KanoczTomas's BTC node
* Add Ergo (ERG) without Bouncy Castle dependency.
* List CTSCoin (CTSC)
* Merge pull request #3289 from plutomonkey/ergo
* Tweak the English name of Japan Bank Transfer payment method
* Merge pull request #3344 from wiz/tweak-japan-bank-transfer-string
* Add mediator prefix to trade statistics
* List Faircoin (FAIR)
* List uPlexa (UPX)
* Remove not used private methods from BisqEnvironment
* Merge pull request #3354 from jsalatas/faircoin-pr
* Merge pull request #3351 from chimp1984/fix-missing-addition-of-mediator
* Merge pull request #3350 from QuantumLeaper/list-upx-asset
* Merge pull request #3324 from ctscoin/list-ctsc-asset
* Add onInitP2pNetwork and onInitWallet to BisqSetupListener
* Start server at onInitWallet and add wallet password handler
* Merge pull request #3263 from wiz/disable-kanocztomas-onion-btcnode
* Merge pull request #3348 from blabno/changes-needed-for-minimal-api
* Add combination (Blockstream.info + Mempool.space) block explorer
* Revert "Temporarily disable onion host for @KanoczTomas's BTC node"
* Temporarily disable KanoczTomas btcnode on both onion and clearnet
* Merge pull request #3378 from wiz/disable-kanocztomas-btcnode-entirely
* Merge pull request #3377 from wiz/add-mempool-space-transaction-tracker
* Refactor BisqApp - update scene size calculation
* Refactor BisqApp - update error popup message build
* Refactor BisqApp - move icon load into ImageUtil
* Remove unused Utilities
* Increase minimum TX fee to 2 sats/vByte to fix #3106 (#3387)
* Fix mistakes in English source (#3386)
* Merge pull request #3383 from lusarz/remove-unused-utilities
* Merge pull request #3382 from lusarz/refactor-bisq-app-image-util
* Merge pull request #3381 from lusarz/refactor-bisq-app-throwable
* Refactor BisqEnvironment
* Merge pull request #3380 from lusarz/refactor-bisq-app-scene-size-calculation
* Merge pull request #3363 from lusarz/refactor-bisq-environment-2
* Merge pull request #3362 from lusarz/refactor-bisq-environment
* Merge branch 'master' of github.com:bisq-network/bisq into merge-with-master
-- File Changes --
A assets/src/main/java/bisq/asset/coins/CTSCoin.java (36)
A assets/src/main/java/bisq/asset/coins/Ergo.java (53)
A assets/src/main/java/bisq/asset/coins/Faircoin.java (39)
A assets/src/main/java/bisq/asset/coins/uPlexa.java (30)
M assets/src/main/resources/META-INF/services/bisq.asset.Asset (4)
A assets/src/test/java/bisq/asset/coins/CTSCoinTest.java (43)
A assets/src/test/java/bisq/asset/coins/ErgoTest.java (47)
A assets/src/test/java/bisq/asset/coins/FaircoinTest.java (41)
A assets/src/test/java/bisq/asset/coins/uPlexaTest.java (48)
M common/src/main/java/bisq/common/util/Utilities.java (140)
M common/src/test/java/bisq/common/util/UtilitiesTest.java (10)
M core/src/main/java/bisq/core/app/BisqEnvironment.java (204)
M core/src/main/java/bisq/core/app/BisqExecutable.java (4)
M core/src/main/java/bisq/core/app/BisqHeadlessApp.java (4)
M core/src/main/java/bisq/core/app/BisqSetup.java (29)
M core/src/main/java/bisq/core/app/HeadlessApp.java (2)
M core/src/main/java/bisq/core/btc/BaseCurrencyNetwork.java (2)
M core/src/main/java/bisq/core/btc/nodes/BtcNodes.java (4)
M core/src/main/java/bisq/core/trade/protocol/tasks/PublishTradeStatistics.java (12)
M core/src/main/java/bisq/core/user/Preferences.java (1)
M core/src/main/resources/i18n/displayStrings.properties (29)
M desktop/src/main/java/bisq/desktop/app/BisqApp.java (26)
M desktop/src/main/java/bisq/desktop/main/MainViewModel.java (6)
M desktop/src/main/java/bisq/desktop/util/ImageUtil.java (14)
-- Patch Links --
https://github.com/bisq-network/bisq/pull/3420.patch
https://github.com/bisq-network/bisq/pull/3420.diff
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/3420
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20191017/27f7bd36/attachment.html>
More information about the bisq-github
mailing list