Manfred Karrer
25190bbe1f
Merge pull request #1296 from ripcurlx/add-util-tests
...
Add util tests
2018-01-30 14:58:41 -05:00
Manfred Karrer
1e13375b9c
Merge remote-tracking branch 'origin/master'
2018-01-30 14:45:16 -05:00
Manfred Karrer
8732aeab54
Merge pull request #1287 from bisq-network/TradePeriodStartsAfterConfirmation
...
Start trading period after deposit transaction confirmation
2018-01-30 14:45:01 -05:00
Manfred Karrer
9ac49bd91a
Change guard logic for bitcoinNodesString
2018-01-30 11:41:42 -05:00
Christoph Atteneder
3d36e56532
Add first simple test for getTradeCurrency
2018-01-30 10:58:58 +01:00
Manfred Karrer
a09df40571
Change sorting
2018-01-29 11:27:21 -05:00
Manfred Karrer
50c1607126
Merge pull request #1290 from bisq-network/fix-zero-balance-after-restore
...
Fix zero balance after restore
2018-01-29 10:09:01 -05:00
Manfred Karrer
d6d5993627
Merge MVT
2018-01-28 19:15:19 -05:00
Manfred Karrer
20fd6a706e
Merge branch 'list-betr-token' of https://github.com/BetterBetting/exchange-bisq-network into BetterBetting-list-betr-token
2018-01-28 19:08:49 -05:00
Manfred Karrer
b220c1a6e2
Add new strings. Cleanup.
2018-01-26 22:25:03 -05:00
Manfred Karrer
f91da81f87
Reuse FileUtil.renameFile
2018-01-26 22:18:47 -05:00
Manfred Karrer
648a7d4a0b
Add handling for canonical at Windows at file delete.
2018-01-26 22:17:33 -05:00
Manfred Karrer
4af8d44d7e
Change open dispute text
2018-01-26 20:07:36 -05:00
Manfred Karrer
537a9ad8ff
Change open dispute text (make open dispute optional)
2018-01-26 19:55:59 -05:00
Manfred Karrer
3e32a71d64
Improve logic flow of getTimeWhenDisputeOpens. Cleanup.
2018-01-26 14:33:44 -05:00
Manfred Karrer
2a004a2f68
Merge branch 'master' into TradePeriodStartsAfterConfirmation
...
# Conflicts:
# core/src/main/java/io/bisq/core/btc/wallet/WalletConfig.java
2018-01-26 12:22:45 -05:00
Chris Beams
f1d0abef4a
Fix typos and English errors in banned node dialog
2018-01-26 16:58:37 +01:00
Saborknight
438e426a4d
Add BETR (Better Betting) token
2018-01-25 17:10:46 +00:00
Manfred Karrer
a0cdffaddc
Deactive dev flags
2018-01-24 20:46:32 -05:00
Manfred Karrer
6895ac9105
Refactoring: Rename methods
2018-01-24 20:43:30 -05:00
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
