Commit Graph

3103 Commits

Author SHA1 Message Date
Manfred Karrer
c0d92fae25 Add try/catch and error msg with info if error at spread calculation (overflow) occurs (again) 2017-03-22 13:16:30 -05:00
Manfred Karrer
50329567bd Increase non trade tx fee default value. change upper limit for tx fee. increase width of data column in arbitr. screen 2017-03-22 13:04:13 -05:00
Manfred Karrer
0a46581407 Add pubKeyHex 2017-03-22 13:03:21 -05:00
Manfred Karrer
b2a85d65f3 Merge branch 'master' into Development
# Conflicts:
#	pom.xml
2017-03-22 12:14:42 -05:00
Manfred Karrer
d3da53d140 Cleanup 2017-03-22 12:14:17 -05:00
Manfred Karrer
6348c9c70a Cleanup 2017-03-22 11:55:15 -05:00
Manfred Karrer
1f0df0c132 Fix unintended string 2017-03-22 11:50:25 -05:00
Manfred Karrer
92ea099ab8 Update to BitcoinJ 0.13.1.11 2017-03-22 11:48:55 -05:00
Manfred Karrer
30e91ea0ee Dont use peers from AddressMessage calls in btcj if we have set our own node addresses or use localhost. 2017-03-17 00:44:01 -05:00
Manfred Karrer
01707ebb2d Update bitcoinJ to 0.13.1.10 2017-03-17 00:12:42 -05:00
Manfred Karrer
ff5cdaacaa Update bitcoinJ to 0.13.1.10 2017-03-17 00:09:53 -05:00
Manfred Karrer
e9fd330447 Merge pull request #768 from undso/scrollpanes
Scrollpanes in market section
2017-03-06 20:48:07 -05:00
Alexander Friedrichs
aa7615cd99 Removed unused code lines 2017-03-06 23:51:39 +01:00
Alexander Friedrichs
c35ce6bb79 Scrollpanes in market section 2017-03-06 23:37:53 +01:00
Manfred Karrer
5bc1ee2257 Merge branch 'Allow_reopen_dispute' into Development 2017-03-06 15:06:15 -05:00
Manfred Karrer
96f208f82b Allow re-opening of a dispute (in case the arbitrator has not received it) 2017-03-06 14:49:29 -05:00
Manfred Karrer
cea8b7d992 delay removeEntryFromMailbox call to avoid repeated application of the same msg 2017-03-06 14:47:45 -05:00
Manfred Karrer
20189b7128 Merge pull request #766 from undso/issue_755
Scale GUI to fit in 1024x700 pixel #755
2017-03-05 17:19:02 -05:00
Manfred Karrer
ecd0ff9971 Merge pull request #765 from undso/scrollpane_to_account_screen
Add scrollpane to account screen #708
2017-03-05 15:13:27 -05:00
Alexander Friedrichs
20103cba7e Scale GUI to fit in 1024x700 pixel #755 2017-03-05 17:21:34 +01:00
Alexander Friedrichs
f829d04986 Add scrollpane to account screen #708 2017-03-04 23:38:13 +01:00
Manfred Karrer
4e467b9530 Display BuyerMultiSigPubKey and SellerMultiSigPubKey in Contract.toString. Use Utils.HEX.encode instead of Arrays.toString for pub keys printing.
Remove BuyerMultiSigPubKey and SellerMultiSigPubKey from ContractWindow and TradeDetailsWindow (included in contract.toString now)
2017-03-01 10:18:44 -05:00
Manfred Karrer
9704619f6b Merge remote-tracking branch 'origin/Development' into Development 2017-02-28 09:57:14 -05:00
Manfred Karrer
e91ab3b584 Improve error logs 2017-02-28 09:56:51 -05:00
Manfred Karrer
a239ccee10 Remove debug logs 2017-02-28 09:55:37 -05:00
Manfred Karrer
c1a44afb91 Use MAX_MSG_SIZE_GET_DATA for GetDataRequest 2017-02-28 09:54:21 -05:00
Manfred Karrer
478ecac255 Merge branch 'master' into Development 2017-02-23 14:07:37 -05:00
Manfred Karrer
01fbab60b7 Fix missing tx fee at Empty Wallet method. Add more logs 2017-02-23 14:06:06 -05:00
Manfred Karrer
7b866823c0 Fix wrong spread calculation for altcoins 2017-02-20 06:59:13 -05:00
Manfred Karrer
4f0d6484c5 Add saving of addressEntryList at each change of list, remove usage of AddressEntry in TradeWalletService.
Add pubKey to contract window at trade details popup.
Remove unused arrays in SpendFromDepositTxWindow.
2017-02-19 13:14:27 -05:00
Manfred Karrer
850f0ef8ef Add pub keys to trade detail window contract print 2017-02-18 19:16:38 -05:00
Manfred Karrer
a402cb9a02 Merge branch 'master' into Development 2017-02-16 11:24:48 -05:00
Manfred Karrer
ca42954d3f Merge pull request #760 from sponnet/master
ETH validator / test added
2017-02-16 11:22:54 -05:00
Stefaan Ponnet
666b29db6e ETH validator / test added 2017-02-16 15:06:58 +01:00
Manfred Karrer
236044f513 Add debug tool for getting out all deposit txs for finding missing payout txs. 2017-02-15 15:58:08 -05:00
Manfred Karrer
f291afe903 Fix incorrect separators 2017-02-12 14:19:51 -05:00
Manfred Karrer
59029cfc34 Update git ignore 2017-02-12 12:15:12 -05:00
Manfred Karrer
246b15bee9 Add util for printing all altcoins for adding to FAQ page 2017-02-11 22:33:08 -05:00
Manfred Karrer
6281ecc7e2 Version 0.4.9.9 2017-02-11 21:17:39 -05:00
Manfred Karrer
f42628fcd8 Add offer as parameter to getSecurityDeposit and getFixedTxFeeForTrades calls if available to support trades between different protocol versions 2017-02-11 21:06:01 -05:00
Manfred Karrer
80ec899bad update win build script 2017-02-11 20:06:20 -05:00
Manfred Karrer
8f60eb3acf update win build script 2017-02-11 20:02:08 -05:00
Manfred Karrer
e2e038b4e7 v0.4.9.9 2017-02-11 19:25:51 -05:00
Manfred Karrer
20571e03df Merge branch 'Development' 2017-02-11 19:24:46 -05:00
Manfred Karrer
c3aed9fbda Update build script 2017-02-11 18:43:49 -05:00
Manfred Karrer
71f98a5d28 Update install script 2017-02-11 18:18:41 -05:00
Manfred Karrer
3bd1f65f05 Update PersistedP2PStorageData 2017-02-11 18:02:43 -05:00
Manfred Karrer
f04511cfce Fix build script 2017-02-11 17:53:50 -05:00
Manfred Karrer
002a94eafe Fix build script 2017-02-11 17:43:21 -05:00
Manfred Karrer
4cc2ee4f63 Add check for protocol version at dispute close window 2017-02-11 17:17:57 -05:00