mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity
5038 commits 3 branches 150 tags 4.1 GiB
Commit graph

1883 commits

Author SHA1 Message Date
Manfred Karrer
6d98ce4af2
Refactor: Move code from PendingTradesViewModel.getTimeWhenDisputeOpens to Trade.getTradeStartTime. 2018-01-26 20:11:03 -05:00
Manfred Karrer
3e32a71d64
Improve logic flow of getTimeWhenDisputeOpens. Cleanup. 2018-01-26 14:33:44 -05:00
Manfred Karrer
a70a810c76
Set boundaries for block date 2018-01-26 12:35:10 -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
Manfred Karrer
50f9a790fd
Cleanup 2018-01-26 11:32:01 -05:00
Manfred Karrer
f108836d1d
Revert isPreferred currencies change in 0.6.3 #1284 2018-01-26 11:30:59 -05:00
Manfred Karrer
d565c9fe0c
Refactoring: Rename onBootstrapComplete to onUpdatedDataReceived and onRequestingDataCompleted to onDataReceived. 2018-01-25 18:40:21 -05:00
Christoph Atteneder
71dbd7d343
Overwrite default locale to prevent failed tests when having different system locale (!"en_US") 2018-01-25 18:29:45 +01:00
Saborknight
438e426a4d
Add BETR (Better Betting) token 2018-01-25 17:10:46 +00:00
Christoph Atteneder
b2becf9484
Adapt sorting behavior to values displayed in the sort column 2018-01-24 15:25:55 +01:00
Manfred Karrer
9546a95f48
Add colon to label 2018-01-22 20:29:15 -05:00
Manfred Karrer
8b98429341
Only add offers if it is not in list 2018-01-21 12:06:38 -05:00
Manfred Karrer
c4c4c0662b
Add extra checks to avoid duplicated offers (#1246) 2018-01-21 09:25:31 -05: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
8360f3b0e3
Cleanup 2018-01-20 19:24:18 -05:00
Manfred Karrer
ca1b73fdf4
Add missing param to display string 2018-01-20 17:36:37 -05:00
Manfred Karrer
4e2fe82ba2
Fix missing @Inject at ManualPayoutTxWindow 2018-01-20 09:14:28 -05:00
Manfred Karrer
328d89da6c
Add isReadyForTxBroadcast check for withdrawal at TransactionsView (revert tx) 2018-01-20 09:11:07 -05:00
Manfred Karrer
7955dec7fb
Add isReadyForTxBroadcast check for withdrawal at trade complete screen 2018-01-20 09:08:15 -05:00
Manfred Karrer
725bf14b22
Add isReadyForTxBroadcast check for WithdrawalView 2018-01-20 09:04:36 -05:00
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
Manfred Karrer
775e687fe5
Merge branch 'master' into TradePeriodStartsAfterConfirmation 2018-01-12 22:43:31 +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