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

1030 commits

Author SHA1 Message Date
Mike Rosseel
da0ade10b8 re-add GUI integration with api 2017-03-09 08:23:33 +01:00
Mike Rosseel
01ce7bdf35 make compile by excluding stuff (caused by the enforcer) 2017-03-07 10:07:34 +01:00
Mike Rosseel
8a97eee0f9 Merge branch 'Development' into issue544-api 2017-03-07 08:02:49 +01:00
Mike Rosseel
44b8522996 Merge branch 'Development' into issue544-api 
Conflicts:
	core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java
	pom.xml
 2017-03-07 08:02:29 +01: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
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
e91ab3b584 Improve error logs 2017-02-28 09:56:51 -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
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
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
4cc2ee4f63 Add check for protocol version at dispute close window 2017-02-11 17:17:57 -05:00
Manfred Karrer
71e8bf524b Update CASH_DEPOSIT_SHORT=Cash Deposit 2017-02-11 16:54:23 -05:00
Manfred Karrer
890c724a87 Prepare for v 0.4.9.9 2017-02-10 19:49:33 -05:00
Manfred Karrer
49940b6420 Small adoptions, cleanups 2017-02-10 19:47:44 -05:00
Manfred Karrer
7825225985 Update string 2017-02-10 19:47:12 -05:00
Manfred Karrer
de4600acd2 Fix incorrect toString call for displaying btc addresses (onion support) 2017-02-10 19:04:46 -05:00
Manfred Karrer
7028b3afef Add checkIfOpenOffersMatchTradeProtocolVersion method at startup 2017-02-10 18:36:32 -05:00
Manfred Karrer
33f16cee80 Deactivate outdated tests, cleanup 2017-02-10 14:59:23 -05:00
Manfred Karrer
3d72884eee Use validateIfNotEmpty 2017-02-10 10:41:07 -05:00
Manfred Karrer
c011b3e95a Merge pull request #754 from SimonTuberlin/InteracETransfer 
Interac e transfer
 2017-02-10 10:18:59 -05:00
Manfred Karrer
9f908b2aea add verify task to build script, update pom 2017-02-10 00:31:48 -05:00
Manfred Karrer
7e71c8c4b6 Add DependencyConvergence 2017-02-10 00:04:21 -05:00
Manfred Karrer
376adb6d1e Move digest-enforcer-rules to gui module and add more entries 2017-02-09 23:58:55 -05:00
Manfred Karrer
05bb832487 Merge branch 'master' into Development 2017-02-09 21:34:51 -05:00
SimonTuberlin
965bf45f34 changed input validator for Interac question and answer field 2017-02-09 17:11:02 +01:00
SimonTuberlin
483058c13f Added unit test for Interac 
softened Interac phone number format check, updated IBAN check
 2017-02-09 16:45:45 +01:00
SimonTuberlin
df90eec79e InteracETransfer 
Small fix in EmailValidator
 2017-02-09 14:54:03 +01:00
Manfred Karrer
a83acbeb25 Reduce tx fee, sec. deposit and createe offer fee, cleanup, comments update 2017-02-08 16:15:14 -05:00
wodry
cd3606191e Bugfix 2017-02-08 05:58:16 +01:00
Manfred Karrer
b688c78504 Show atbitr. tab for retired arbitrators 2017-02-07 21:02:00 -05:00
Manfred Karrer
6a2675a3ed Reduce length of short id 2017-02-07 20:42:56 -05:00
Manfred Karrer
297c6deab6 Increase max. allowed deviation from market price to 30% 2017-02-07 20:29:47 -05:00
Manfred Karrer
910d01535a Add percentage to spread table 2017-02-07 20:25:00 -05:00
Manfred Karrer
ea4fc12092 Use dash instead of underscore for offer id 2017-02-07 20:24:44 -05:00
Manfred Karrer
4cafddabc7 Add version nr to offer id, use more randomized prefix for short id 2017-02-07 19:44:45 -05:00
Manfred Karrer
f8d4aa8b7c Don't show error popup when Linux display bug occurs (caused by screen resize, sleep. java.lang.ClassCastException: sun.awt.image.BufImgSurfaceData cannot be cast to sun.java2d.xr.XRSurfaceData) 2017-02-07 16:42:10 -05:00
wodry
0e55e50508 Translated outstanding strings 2017-02-07 22:28:48 +01:00
Manfred Karrer
afaa3add89 Rename Cash/ATM deposit to Cash deposit 2017-02-07 10:22:17 -05:00