Commit graph

1972 commits

Author SHA1 Message Date
Manfred Karrer
a805d5fd0e
Add isReadyForTxBroadcast check for EmptyWalletWindow 2018-01-20 08:59:19 -05:00
Manfred Karrer
75d44f2be8
Add isReadyForTxBroadcast check for DAO classes 2018-01-20 08:55:15 -05:00
Manfred Karrer
1943cd2298
Add isReadyForTxBroadcast check for ManualPayoutTxWindow 2018-01-20 08:46:57 -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
1c28eb6f5b
Add isReadyForTxBroadcast check for payout tx 2018-01-20 08:14:56 -05:00
Manfred Karrer
1efd0ff246
Add isReadyForTxBroadcast check to TakeOfferView 2018-01-19 22:03:02 -05:00
Manfred Karrer
93ef9e6963
Remove hasSufficientPeersForBroadcast check from OfferBookView 2018-01-19 21:59:59 -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
Christoph Atteneder
f7993f0206
Remove space from style name so style is applied properly 2018-01-16 12:09:27 +01:00
Christoph Atteneder
d1b25c4733
Use HyperlinkWithIcon 2018-01-15 13:06:09 +01:00
Christoph Atteneder
91972f5b0a
Fix hierarchical/inherit issue with styles for Tooltip 2018-01-15 12:48:52 +01:00
Manfred Karrer
9aef72a558
Fix merge error 2018-01-12 23:34:55 +01: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
33937e1b11
Not applying unconfimred output values to getValueSentToMeForTransaction and getValueSentFromMeForTransaction. Minor refactorings. 2018-01-12 15:59:51 +01:00
Manfred Karrer
27d1083380
Use 60 days for TTL for alert. Cleanups. 2018-01-10 22:21:32 +01:00
Manfred Karrer
5d87e5e9c7
Fix merge error 2018-01-10 21:46:28 +01:00
Manfred Karrer
7753586ea6
Merge branch 'FixWrongFeeCalculationForTaker'
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
#	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java
2018-01-10 20:56:04 +01:00
Manfred Karrer
846aa494ca
Add check for min peers connected for broadcast 2018-01-10 19:41:26 +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
c1d04cd435
Cleanup. Add comment 2018-01-10 18:59:33 +01:00
Manfred Karrer
67a1633ec9
Fix wrong dust check. Fix wrong balance check. Improve logs. Add comments. 2018-01-10 18:54:43 +01:00
Manfred Karrer
c01d87db89
Use average of taker fee and deposit tx for tx fee calculation 2018-01-10 18:06:11 +01:00
Manfred Karrer
077c2d68ed
Fix wrong default tx size for taker 2018-01-10 14:09:04 +01:00
Manfred Karrer
43cc5598ca
Fix wrong fee estimation for taker. Improve logs. 2018-01-10 13:57:07 +01:00
Manfred Karrer
5f10b16e94
Increase timeout for showing Tor network settings window 2018-01-10 00:53:31 +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
f50242a4fa
Merge branch 'dhingra-UI_issue_1084' into Development 2018-01-09 22:09:00 +01:00
Manfred Karrer
e6d55591a6
Reformat, add bracket 2018-01-09 22:08:33 +01:00
Manfred Karrer
ac65414418
Merge branch 'UI_issue_1084' of https://github.com/dhingra/exchange into dhingra-UI_issue_1084 2018-01-09 22:00:42 +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
d19580b32b
Reformat 2018-01-09 21:42:14 +01:00
Manfred Karrer
c0b44165de
Merge branch 'master' of https://github.com/deeponion/exchange into deeponion-master 2018-01-09 21:40:40 +01:00
Manfred Karrer
e2896e3e4f
Merge branch 'master' of https://github.com/madcoin-project/exchange into madcoin-project-master 2018-01-09 21:38:09 +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
1b7db08e68
Add timeout to tx broadcast to call onSuccess at callback in case we don't get the broadcaster completed in time 2018-01-09 20:54:37 +01:00
Manfred Karrer
e8fbd7a3bc
Delete tor directory (excluding hidden service folder) at startup 2018-01-09 20:18:19 +01:00
Manfred Karrer
c8b216a890
Merge branch 'master' into Development 2018-01-09 13:56:01 +01:00
Chris Beams
66d4b2c162
Remove trailing whitespace and use expression lambda 2018-01-08 10:27:20 +01:00
Alex Meyer
2f35186c09 Send messages when CMD+ENTER is pressed and focus is on the message input area 2018-01-07 23:50:23 -06:00
Manfred Karrer
80aca142ff
Fix issue with bouncycastle in pom 2018-01-04 23:46:42 +01:00
Manfred Karrer
dbdb8b3cea
Add nullcheck at seed restore 2018-01-03 17:52:32 +01:00
Ed Zynda III
f4079c5e05
Add test for WILD Token validation 2018-01-02 17:04:14 +02:00
Ed Zynda III
ea1ac71436
Add WILD Token address validation 2018-01-02 17:02:28 +02:00
Chris Beams
604a9b1389
Use 'yyyy' vs 'YYYY' in date format for backup folder
This fixes the bug described in #1137. Lower-case 'yyyy' is the format
that always should have been used here.
2017-12-31 13:29:23 +01:00
Christoph Fröschl
f671b15de5 added XIN (Infinity Economics) 2017-12-30 14:46:03 +01:00