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
3232 commits 3 branches 150 tags 4.1 GiB
Commit graph

1085 commits

Author SHA1 Message Date
Manfred Karrer
0982346636 Add translation strings for TradesChartsView 2017-03-05 19:33:36 -05:00
Manfred Karrer
9edf504018 Add translation strings for SpreadView 2017-03-05 18:47:13 -05:00
Manfred Karrer
d3380bb450 Add translation strings for market and market.offerbook 2017-03-05 18:30:08 -05:00
Manfred Karrer
1e55c1249e Merge branch 'DAO' into doa_with_translations 2017-03-05 17:51:31 -05:00
Manfred Karrer
20f53f3ee6 Merged Scroll pane PR (https://github.com/bitsquare/bitsquare/pull/766, https://github.com/bitsquare/bitsquare/pull/765) 2017-03-05 17:47:07 -05:00
Manfred Karrer
795327ed78 Merged Scroll pane PR (https://github.com/bitsquare/bitsquare/pull/766, https://github.com/bitsquare/bitsquare/pull/765) 2017-03-05 17:46:55 -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
Manfred Karrer
1470fbb444 Added all resources for MainView 2017-03-04 23:23:30 -05:00
Manfred Karrer
aae59466d4 Rename BSResources to Res 2017-03-04 19:00:58 -05:00
Manfred Karrer
f626509158 Apply resources to BitsquareApp and MainView (WIP) 2017-03-04 18:58:27 -05:00
Alexander Friedrichs
f829d04986 Add scrollpane to account screen #708 2017-03-04 23:38:13 +01:00
Manfred Karrer
1bffdd3eaa Add PromptText to tet area input field 2017-03-04 17:36:59 -05:00
Manfred Karrer
bcd47f663a Update MIN_NONDUST_OUTPUT from 546 to 2730 (https://github.com/bitcoinj/bitcoinj/blob/master/core/src/main/java/org/bitcoinj/core/Transaction.java) 2017-03-04 13:31:32 -05:00
Manfred Karrer
e553a038f5 Add DevFlags.DEV_ARBITRATOR to support dev keys. Autofill key if DEV_ARBITRATOR is set 2017-03-03 18:37:33 -05:00
Manfred Karrer
28a704ed85 Fix bug with backup path when path became invalid. Improve backup handling and UI. 2017-03-01 20:46:17 -05:00
Manfred Karrer
bbe7192041 Refactor Wallet classes 2017-03-01 19:49:23 -05:00
Manfred Karrer
55e7871777 Rename shutDownDone to shutDownComplete at WalletsSetup. 2017-03-01 11:27:54 -05: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
Manfred Karrer
81fe43172c Improve error log 2017-02-28 09:59:02 -05:00
Manfred Karrer
e91ab3b584 Improve error logs 2017-02-28 09:56:51 -05:00
Manfred Karrer
60597cec88 Rename all appearances of squ to bsq 2017-02-25 10:45:22 -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
Manfred Karrer
aae9479e1b Use same seed for both BTC and SQU wallet 2017-02-21 15:51:35 -05:00
Manfred Karrer
17a4a032cd Add security deposit display to take offer screen 2017-02-20 18:38:45 -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
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
7b866823c0 Fix wrong spread calculation for altcoins 2017-02-20 06:59:13 -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
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
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
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
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