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

1051 commits

Author SHA1 Message Date
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
Manfred Karrer
3777a65b2f Fix wrong spread calculation for altcoins 2017-02-20 06:59:39 -05: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
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
0580e73179 Use new tx and trade fees. UI improvements, remove trade fee from provider data 2017-02-16 15:43:38 -05:00
Manfred Karrer
e31dac1e49 Merge branch 'Development' into DAO 2017-02-15 16:02:58 -05: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
839670739d Cleanup 2017-02-12 14:09:01 -05:00
Manfred Karrer
d666490424 Set v 0.5.0.0, fix issues after merge. 2017-02-12 13:38:26 -05:00
Manfred Karrer
358f292cbe Merge branch 'Development' into DAO 
# Conflicts:
#	common/src/main/java/io/bitsquare/app/Version.java
#	core/src/main/java/io/bitsquare/btc/FeePolicy.java
#	core/src/main/java/io/bitsquare/btc/WalletAppKitBitSquare.java
#	core/src/main/java/io/bitsquare/btc/WalletService.java
#	core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java
#	core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
#	core/src/main/java/io/bitsquare/trade/BuyerTrade.java
#	core/src/main/java/io/bitsquare/trade/SellerTrade.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/OffererCreatesAndSignsDepositTxAsBuyer.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTxAsBuyer.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/TakerCreatesDepositTxInputsAsBuyer.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignAndPublishDepositTxAsSeller.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/TakerCreatesDepositTxInputsAsSeller.java
#	gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
#	network/src/main/resources/PersistedP2PStorageData
#	package/mac/create_app.sh
#	pom.xml
#	provider/src/main/java/io/bitsquare/provider/ProviderMain.java
#	provider/src/main/java/io/bitsquare/provider/price/PriceRequestService.java
 2017-02-12 12:59:29 -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
Manfred Karrer
d88aceddf8 Clean up, add missing coins (LTBcoin, SFSC) 2017-02-07 10:05:15 -05:00
Jon Spock
1c6bbb4b6b Add PivxParams file and make sure unit test passes 2017-02-06 18:13:35 -08:00
Manfred Karrer
077d4fe2bc Merge branch 'master' into Development 2017-02-05 21:55:20 -05:00
Manfred Karrer
8d782ea910 Formatting, small cleanups 2017-02-05 21:54:22 -05:00
SimonTuberlin
a34594f404 Added email validator checking for basic rules like only one @ allowed and an at least two chars long letters-only TLD. 
Implemented email check in ChaseQuickPay
 2017-02-06 00:13:13 +01:00
wodry
ac4263f163 Fix doubled line 
Fix doubled line from copy & paste.
 2017-02-04 11:29:13 +01:00
wodry
bf4142bd3f Added some missing German translations, one Bugfix 
According to the Post of user coinstash: https://forum.bitsquare.io/t/any-cunning-linguists-among-us/721/5
I would be delighted if I could help out with German translations.

There is also one type bugfix.
 2017-02-04 11:23:29 +01:00
Manfred Karrer
7cba76fbe9 Revert merged PR (https://github.com/bitsquare/bitsquare/pull/730) 2017-02-02 20:36:10 -05:00
Manfred Karrer
a1e7ccc1bf Merge pull request #730 from dan-da/hiddenservices_pr 
DNS lookups over Tor and connecting bitcoinj to .onion addresses.
 2017-02-02 19:24:54 -05:00
Manfred Karrer
e14d70b9d9 Correct input validation of Norwegian bank account numbers 
(https://github.com/bitsquare/bitsquare/pull/707)
 2017-02-02 19:23:19 -05:00
Manfred Karrer
b2670c082a Deactivate PIVX as tests are failing 2017-02-02 14:38:43 -05:00