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

3368 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mike Rosseel
fd9e48d8b7 revert to as close as the old version as possible 2017-03-01 16:26:07 +01:00
Manfred Karrer
f27437b008 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:19:23 -05: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
Mike Rosseel
5b5329ffd4 fix string interning problem by removing Utilities.serialize calls and doing signing also with protobuffer 2017-03-01 09:20:13 +01:00
Manfred Karrer
81fe43172c Improve error log 2017-02-28 09:59:02 -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
56db98b788 Use MAX_MSG_SIZE_GET_DATA for GetDataRequest 2017-02-28 09:53:55 -05:00
Manfred Karrer
ab01e97ddc Move BTC_NODES and USE_TOR_FOR_BTC to BtcOptionKeys 2017-02-25 13:23:35 -05:00
Manfred Karrer
60597cec88 Rename all appearances of squ to bsq 2017-02-25 10:45:22 -05:00
Manfred Karrer
073302827b Add BSQ to altcoin list 2017-02-25 10:01:46 -05:00
Manfred Karrer
134b0a1220 Replace SQU with BSQ 2017-02-25 09:59:32 -05:00
Manfred Karrer
f5d05f0940 Fix null pointers, improve logs 2017-02-24 15:03:26 -05:00
Mike Rosseel
2cdb9917de fix missing round-trip ctor arguments 2017-02-24 16:13:28 +01:00
Manfred Karrer
972721cdba Add more logs to empyt wallet and double spend method 2017-02-23 14:13:10 -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
Mike Rosseel
f6f61a36fc fix the non-serialisable LazyStringArrayList objects which come from protobuffer if no value was present. 2017-02-22 16:55:38 +01:00
Mike Rosseel
60e3f155b6 use correct version of neemre 2017-02-22 08:57:20 +01:00
Manfred Karrer
aae9479e1b Use same seed for both BTC and SQU wallet 2017-02-21 15:51:35 -05:00
Manfred Karrer
9ed8a13422 Update to tor binaries from Tor Browser 6.5 2017-02-21 14:24:57 -05:00
Manfred Karrer
9f5b7f693b Use for Winows build no version nr at jar files to avoid collecting multiple jars at updates 2017-02-21 11:57:30 -05:00
Manfred Karrer
16ca619057 Overwrite first with random bytes before setting aesKey null 2017-02-21 09:45:56 -05:00
Mike Rosseel
a18bbc5f39 first pass at fixing NPE's 2017-02-21 15:05:44 +01:00
Manfred Karrer
ea531247ec Merge branch 'policyfile' into DAO 
# Conflicts:
#	core/pom.xml
 2017-02-21 08:10:21 -05:00
Mike Rosseel
2b6c56276e exclude certain dependencies from neemre.btcd 2017-02-21 08:13:37 +01:00
Manfred Karrer
17a4a032cd Add security deposit display to take offer screen 2017-02-20 18:38:45 -05:00
Manfred Karrer
2c211a9ae4 Add comments 2017-02-20 18:15:26 -05:00
Manfred Karrer
827c581a73 Make security deposit customizable at offer creation (allowed range: 0.001 BTC - 0.2 BTC). 
Use new max. trade limits
 2017-02-20 17:58:07 -05:00
Manfred Karrer
159b208273 Add btcd-cli4j lib as local build jar instead of using http repo. Add exclude for diff. version dependencies. 2017-02-20 14:29:58 -05:00
Manfred Karrer
fb63fd7c94 Merge branch 'policyfile' into DAO 2017-02-20 13:32:16 -05:00
Manfred Karrer
023d20da7a Add missing class 2017-02-20 13:30:41 -05:00
Mike Rosseel
f3d1c87d4e hand-merge of policyfile-dev branch 2017-02-20 17:04:17 +01:00
Manfred Karrer
78a8e1ba39 Use percentage based price as default, swap input text controls when toggle between fixed price and percentage based price. Hide percentage based inputs if no market price is available. 2017-02-20 11:02:54 -05:00
Mike Rosseel
f531659bf2 Merge branch 'DAO' into policyfile 2017-02-20 15:31:35 +01:00
Mike Rosseel
26aa1ae48d Merge branch 'DAO' into policyfile 
Conflicts:
	package/mac/create_app.sh
	package/windows/32bitBuild.bat
	package/windows/64bitBuild.bat
 2017-02-20 15:16:13 +01:00
Mike Rosseel
1017502035 fix communication problem 2017-02-20 15:12:42 +01:00
Manfred Karrer
3777a65b2f Fix wrong spread calculation for altcoins 2017-02-20 06:59:39 -05:00
Manfred Karrer
7b866823c0 Fix wrong spread calculation for altcoins 2017-02-20 06:59:13 -05:00
Mike Rosseel
7db8b8ece3 remove BSEnvironment changes, add logging to fromProtoBuffer 2017-02-20 10:58:34 +01:00
Mike Rosseel
5d6537a0d2 Removed the spring bug fix class because upgrading to 4.3.6-RELEASE fixed the bug + no more confusion on import between the two classes. Bitsquare now starts again, P2P to be tested 2017-02-20 09:50:09 +01:00
Manfred Karrer
a24609e21b Check that MultiSig address entry matches stored pubKey. Save pubKey in processModel. Add more logging of txs. 2017-02-19 19:01:52 -05:00
Manfred Karrer
2520f8d46f Check that MultiSig address entry matches stored pubKey. Save pubKey in processModel. Add more logging of txs. 2017-02-19 18:59:49 -05:00
Manfred Karrer
aa084dba28 User percentage based trade fee as well as market price based factor. Display % in fee info popups. 2017-02-19 13:40:47 -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
Mike Rosseel
92323ce561 moving app classes to make it start again. 2017-02-17 14:46:06 +01:00
Mike Rosseel
a3b31ce32b moving app classes to make it start again. 2017-02-17 14:45:03 +01:00