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

230 commits

Author SHA1 Message Date
Manfred Karrer
1a634d919f cleanup 2017-03-12 12:23:53 -05:00
Manfred Karrer
9d8b3ed6eb Apply display strings for dao 2017-03-11 18:23:53 -05:00
Manfred Karrer
c6b5cbda02 Apply displaystring for create offer and take offer views 2017-03-07 23:12:24 -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
4a52ad5be1 Add comment 2017-03-03 10:39:47 -05:00
Manfred Karrer
002211b7f6 Reset sub version nr to 1 2017-03-03 10:38:28 -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
16ca619057 Overwrite first with random bytes before setting aesKey null 2017-02-21 09:45:56 -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
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
6281ecc7e2 Version 0.4.9.9 2017-02-11 21:17:39 -05:00
Manfred Karrer
e2e038b4e7 v0.4.9.9 2017-02-11 19:25:51 -05:00
Manfred Karrer
890c724a87 Prepare for v 0.4.9.9 2017-02-10 19:49:33 -05:00
Mike Rosseel
6c6937f61f add maven dependency check plugin 2017-02-09 16:22:45 +01: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
d65e098933 Increase tx fee to 0.0007 btc, increase tradeprotocol version, change log level for tx details to INFO 2017-02-07 18:47:20 -05:00
Manfred Karrer
8f871e2629 Add UTXO handling of orphan transactions, Add SquBlockchainManager, add Unittests 2017-01-17 02:56:30 +01:00
Manfred Karrer
32e7bd7f0b Update voting hash calculation 2016-12-22 01:46:14 +01:00
Manfred Karrer
5dc00eb427 Use version byte and ripemd160 hash of json for comp. data. Use only primitive data in comp. data. 2016-12-21 23:05:04 +01:00
Manfred Karrer
5de17018f0 Clean up tx creation, fix issue with tx commit in both wallets. Add data for voting hash 2016-12-19 00:47:21 +01:00
Manfred Karrer
d9f8e20554 Change naming: Proposal to CompensationRequest 2016-12-14 19:24:53 +01:00
Manfred Karrer
462158bae8 Add menu item and views for dao 2016-12-07 18:55:23 +01:00
Manfred Karrer
18a3a0df5a v0.4.9.8 2016-11-19 16:54:54 +01:00
Manfred Karrer
3bf4c60567 Prepare for v0.4.9.8 2016-11-19 14:36:23 +01:00
Manfred Karrer
2f5c1a926a Check if supported crypto key length is > 128 (security policy adopted in Oracel JDK) 2016-10-20 01:45:19 +02:00
Manfred Karrer
9a3cc19efa V 0.4.9.7 2016-10-20 00:10:45 +02:00
Manfred Karrer
22250574d8 Prepare for v 0.4.9.7 2016-10-19 22:04:46 +02:00
Manfred Karrer
b2b66d42a8 Add LookAheadObjectInputStream 2016-10-12 23:19:08 +02:00
Manfred Karrer
6834c808c6 Cleanup 2016-10-07 01:44:13 +02:00
Manfred Karrer
25830ed668 Add custom payout amount textfields to DisputeSummaryPopup (WIP) 2016-10-06 21:01:18 +02:00
Manfred Karrer
bac867873d Improve wording, improve layout 2016-10-06 00:34:10 +02:00
Manfred Karrer
be27a11998 Improve wording 2016-10-06 00:25:57 +02:00
Manfred Karrer
e747392323 v0.4.9.6 2016-09-04 14:48:38 -05:00
Manfred Karrer
83d411eba5 Prepare v0.4.9.6 2016-09-03 10:34:48 -05:00
Manfred Karrer
04bcfead57 v 0.4.9.5 2016-08-29 16:48:15 +02:00
Manfred Karrer
cd0ec19f4b Add null checks, cleanup 2016-08-28 18:31:23 +02:00
Manfred Karrer
a803077296 Prepare for v 0.4.9.5 2016-08-26 17:03:01 +02:00
Manfred Karrer
e8cdea6aa4 Add email to Cash deposit and extend info text 2016-08-25 20:15:08 +02:00
Manfred Karrer
cd4401a001 Add new payment methods: ClearXExchange, US Postal Money Order and US CashDeposit (WIP). Deactivate bank transfers for US. 2016-08-25 18:25:19 +02:00
Manfred Karrer
18d3dfd38b Store arbitrator pubKey in trade object to avoid null pointer when the arbitrator is not available in the trade process 2016-08-25 02:36:16 +02:00
Manfred Karrer
7af384cb30 Prepare for 0.4.9.3 2016-08-23 15:38:08 +02:00
Manfred Karrer
1357cc3536 Apply inverted price to markets screens, various refactorings, bugfixes 2016-08-23 10:31:43 +02:00
Manfred Karrer
8d13df152a Fix layout and visibility bug for price feed provider logos, fix formatting issue with scientific notation 2016-08-21 02:40:59 +02:00
Manfred Karrer
a6958b570d Apply inverted price to create offer view 2016-08-20 21:47:59 +02:00
Manfred Karrer
1c6376d462 Invert price in pending offers and trades 2016-08-19 20:45:14 +02:00
Manfred Karrer
506899e326 Remove ETC warning 2016-08-19 19:26:33 +02:00
Manfred Karrer
20fd68193a Version 0.4.9.3 2016-08-08 04:18:45 +02:00
Manfred Karrer
849af2449d Add deleteOnExit for tem file 2016-08-08 01:34:04 +02:00