3 commits

Author	SHA1	Message	Date
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	963086106f	Move mining fee payment to taker. Refactor package io.bitsquare.pricefeed to io.bitsquare.provider.price. Rename option priceFeedProviders to providers	2016-12-05 17:25:50 +01:00

Renamed from pricefeed/pom.xml (Browse further)