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 |
|
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 |
|
Manfred Karrer
|
ca42954d3f
|
Merge pull request #760 from sponnet/master
ETH validator / test added
|
2017-02-16 11:22:54 -05:00 |
|
Stefaan Ponnet
|
666b29db6e
|
ETH validator / test added
|
2017-02-16 15:06:58 +01:00 |
|
Mike Rosseel
|
17798cabf0
|
move apps back to where they belong
|
2017-02-16 14:13:34 +01:00 |
|
Mike Rosseel
|
b8a68658b0
|
fromProtoBuf is code complete
|
2017-02-16 09:04:23 +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 |
|
Mike Rosseel
|
22d5d5267b
|
compiles again
|
2017-02-14 17:33:35 +01:00 |
|
Manfred Karrer
|
3094d13d8b
|
Fix wrong separators
|
2017-02-12 14:20:52 -05:00 |
|
Manfred Karrer
|
f291afe903
|
Fix incorrect separators
|
2017-02-12 14:19:51 -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
|
59029cfc34
|
Update git ignore
|
2017-02-12 12:15:12 -05:00 |
|
Manfred Karrer
|
c1496086c8
|
Add rpc files
|
2017-02-12 12:14:05 -05:00 |
|
Manfred Karrer
|
246b15bee9
|
Add util for printing all altcoins for adding to FAQ page
|
2017-02-11 22:33:08 -05:00 |
|
Manfred Karrer
|
6281ecc7e2
|
Version 0.4.9.9
|
2017-02-11 21:17:39 -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
|
80ec899bad
|
update win build script
|
2017-02-11 20:06:20 -05:00 |
|
Manfred Karrer
|
8f60eb3acf
|
update win build script
|
2017-02-11 20:02:08 -05:00 |
|
Manfred Karrer
|
e2e038b4e7
|
v0.4.9.9
|
2017-02-11 19:25:51 -05:00 |
|
Manfred Karrer
|
20571e03df
|
Merge branch 'Development'
|
2017-02-11 19:24:46 -05:00 |
|
Manfred Karrer
|
c3aed9fbda
|
Update build script
|
2017-02-11 18:43:49 -05:00 |
|
Manfred Karrer
|
71f98a5d28
|
Update install script
|
2017-02-11 18:18:41 -05:00 |
|
Manfred Karrer
|
3bd1f65f05
|
Update PersistedP2PStorageData
|
2017-02-11 18:02:43 -05:00 |
|
Manfred Karrer
|
f04511cfce
|
Fix build script
|
2017-02-11 17:53:50 -05:00 |
|
Manfred Karrer
|
002a94eafe
|
Fix build script
|
2017-02-11 17:43:21 -05:00 |
|
Manfred Karrer
|
4cc2ee4f63
|
Add check for protocol version at dispute close window
|
2017-02-11 17:17:57 -05:00 |
|
Manfred Karrer
|
5fc085ed43
|
Add -Bicon=package/windows/Bitsquare.ico
|
2017-02-11 17:00:39 -05:00 |
|
Manfred Karrer
|
71e8bf524b
|
Update CASH_DEPOSIT_SHORT=Cash Deposit
|
2017-02-11 16:54:23 -05:00 |
|
Manfred Karrer
|
28655e7062
|
Add copy task
|
2017-02-11 14:55:46 -05:00 |
|
Manfred Karrer
|
f64061cbc9
|
Remove preferIPv4Stack entry
|
2017-02-11 13:45:54 -05:00 |
|
Manfred Karrer
|
2ea5df3ba2
|
Change category to Network
|
2017-02-11 12:46:50 -05:00 |
|
Manfred Karrer
|
d83b17de9a
|
Remove unneeded copy task, cleanup empty line
|
2017-02-11 11:54:53 -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 |
|