Manfred Karrer
f1d60ddcdb
Fix wrong argument at callFunctionWithWriteLock
2018-01-24 20:21:22 -05:00
Manfred Karrer
125143c8f5
Merge branch 'bsqparser-test' of https://github.com/sqrrm/exchange into sqrrm-bsqparser-test
2018-01-24 20:13:59 -05:00
Manfred Karrer
34dd0b71d0
Merge branch 'Development' into dao
...
# Conflicts:
# gui/src/main/java/io/bisq/gui/bisq.css
# gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java
# gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java
# gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java
# gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java
# gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java
2018-01-24 19:44:01 -05:00
sqrrm
e9e4a827ca
bsqblockchain: use write lock for atomic writes
...
A ReentrantReadWriteLock is used. By acquiring the write lock over the
atomic write all other locks acquired during the atomic operation will
work as expected.
2018-01-23 15:37:22 +01:00
Manfred Karrer
d341c44471
Merge branch 'master' into Development
2018-01-22 20:29:30 -05:00
Manfred Karrer
14b0292460
Merge branch 'Development' into UI-improvements
2018-01-22 19:44:51 -05:00
Chris Beams
c725376e8d
Replace 'that' => 'this' in version update dialog
2018-01-22 08:55:32 +01:00
Manfred Karrer
33eecd81aa
Release 0.6.4
2018-01-20 20:47:53 -05:00
Manfred Karrer
0dc5d82983
Add XIN
2018-01-20 19:41:07 -05:00
Manfred Karrer
0594bddd0d
Add CREA coin
2018-01-20 19:38:00 -05:00
Manfred Karrer
9cf9ce6ea4
Alwyas check for block download complete also if not localhost btc node
2018-01-20 08:44:18 -05:00
Manfred Karrer
fab97fcaf8
Show warning popup if not sufficient btc nodes or localhost btc node not synced
2018-01-19 21:58:26 -05:00
Manfred Karrer
a423c7fe86
Display localhost btc node in footer text and connection lost popup
2018-01-19 21:10:11 -05:00
Manfred Karrer
10a2b53e3a
Merge branch 'master' into dao
...
# Conflicts:
# core/src/main/java/io/bisq/core/app/SetupUtils.java
# core/src/main/java/io/bisq/core/btc/wallet/BsqWalletService.java
# core/src/main/java/io/bisq/core/btc/wallet/WalletService.java
# gui/src/main/java/io/bisq/gui/bisq.css
# gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java
# gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java
# gui/src/main/resources/logback.xml
# network/src/main/java/io/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java
# network/src/main/java/io/bisq/network/p2p/peers/getdata/RequestDataHandler.java
# network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
2018-01-12 23:21:22 +01:00
Manfred Karrer
775e687fe5
Merge branch 'master' into TradePeriodStartsAfterConfirmation
2018-01-12 22:43:31 +01:00
Manfred Karrer
848bbdd9b1
Make tx parsing atomic by read/write lock (WIP). Add comments.
2018-01-12 18:26:33 +01:00
Manfred Karrer
d9c9345b59
Add comments. Cleanup
2018-01-12 16:48:05 +01:00
Christoph Fröschl
934d50d473
Merge branch 'Development' of https://github.com/bisq-network/exchange into Development
2018-01-10 19:25:10 +01:00
Manfred Karrer
aeec075c91
Prepare v0.6.3
2018-01-09 23:36:49 +01:00
Manfred Karrer
79e16a4b7a
Add support for start trade period timer after deposit tx has been confirmed. Not working yet.
2018-01-09 23:30:29 +01:00
Manfred Karrer
c3e648dc6b
Disable dev mode
2018-01-09 22:13:55 +01:00
Manfred Karrer
5d217aa347
Merge branch 'deeponion-master' into Development
...
# Conflicts:
# gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-01-09 21:44:06 +01:00
Manfred Karrer
532f351b6e
Add WILD token
2018-01-09 21:36:51 +01:00
Manfred Karrer
516d130a5c
Merge branch 'Development' of https://github.com/WildCryptoICO/exchange into WildCryptoICO-Development
2018-01-09 21:34:18 +01:00
Manfred Karrer
4b9788c0bc
Change popup text for Zcoin
2018-01-09 21:30:26 +01:00
Manfred Karrer
7f0e871007
Delay callback of tx broadcaster
2018-01-09 21:15:58 +01:00
Manfred Karrer
e8fbd7a3bc
Delete tor directory (excluding hidden service folder) at startup
2018-01-09 20:18:19 +01:00
Ed Zynda III
bc6aa2eb12
Add WILD Token to currency list
2018-01-02 17:05:58 +02:00
Christoph Fröschl
f62e0fb4df
changed to spaces
2017-12-30 14:51:07 +01:00
Christoph Fröschl
f671b15de5
added XIN (Infinity Economics)
2017-12-30 14:46:03 +01:00
deeponion
3c3412fe8e
updated for supporting ONION
2017-12-28 00:47:50 -08:00
Manfred Karrer
86fe2c74aa
Merge branch 'feature/display-tor-connection-progress' of https://github.com/ripcurlx/exchange into ripcurlx-feature/display-tor-connection-progress
2017-12-21 00:25:36 +01:00
Manfred Karrer
cf634e2dd0
0.6.2 release candidate
2017-12-20 19:53:28 +01:00
Manfred Karrer
5ce2a67d0c
Prepare release 0.6.2
2017-12-20 01:12:18 +01:00
Manfred Karrer
7e7a06a0da
Merge branch 'jbg-add-xspec'
...
# Conflicts:
# gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2017-12-19 21:22:42 +01:00
Manfred Karrer
23f13c10fe
Merge XSPEC
2017-12-19 21:22:02 +01:00
Manfred Karrer
ad8c23b294
Merge branch 'add-xspec' of https://github.com/jbg/exchange into jbg-add-xspec
2017-12-19 21:20:40 +01:00
Manfred Karrer
ab07e6c47c
Merge branch 'ibininja-master'
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
# gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2017-12-19 21:19:26 +01:00
Manfred Karrer
f3b759046b
Merge
2017-12-19 21:18:37 +01:00
Manfred Karrer
3c0082aee5
Merge branch 'master' of https://github.com/ibininja/exchange into ibininja-master
2017-12-19 21:14:55 +01:00
Manfred Karrer
a5289460d3
Merge PR for Cage
2017-12-19 21:11:44 +01:00
Manfred Karrer
8f48e080cb
Merge branch 'master' into Development
...
# Conflicts:
# core/src/main/java/io/bisq/core/btc/BitcoinNodes.java
# core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
# core/src/main/java/io/bisq/core/filter/FilterManager.java
2017-12-19 19:55:00 +01:00
Arash Ohadi
2879083c8b
Fix typo 'needs' to 'need'
2017-12-19 12:24:14 +01:00
Manfred Karrer
852d4c5ba5
Add and change btc, seed and provider nodes. Use only HS nodes if tor is used for btcj
2017-12-18 23:37:32 +01:00
swordfish5975
eeceef2bb1
Cagecoin
2017-12-18 21:11:16 +10:00
swordfish5975
86370ea1cc
CageCoin
2017-12-18 21:01:29 +10:00
Christoph Atteneder
4cbf518930
Show tor connection progress during app startup
2017-12-18 11:28:14 +01:00
Ibrahim MOKDAD
c6c6892e27
Updated, added true for running on eth blockchain
2017-12-17 09:34:30 +03:00
Ibrahim MOKDAD
158a6badc7
Added CryptoCurrency CRED
2017-12-17 09:03:58 +03:00
Jasper Bryant-Greene
539c767476
Added XSPEC altcoin
2017-12-11 14:21:32 +01:00
