chimp1984 d5dfdb4a35 Merge branch 'chimp-bsq-swap-1' into bsq-swap-low-risk-refactorings-2 ... # Conflicts: # core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java # core/src/main/java/bisq/core/api/CoreOffersService.java # core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java # core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java # core/src/main/java/bisq/core/offer/OpenOfferManager.java # core/src/main/java/bisq/core/offer/bisq_v1/CreateOfferService.java # core/src/main/java/bisq/core/offer/bisq_v1/OfferPayload.java # core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java # core/src/main/java/bisq/core/offer/bisq_v1/TriggerPriceService.java # core/src/main/java/bisq/core/proto/ProtoDevUtil.java # core/src/main/java/bisq/core/trade/TradeManager.java # core/src/main/java/bisq/core/trade/bisq_v1/TradeResultHandler.java # core/src/main/java/bisq/core/trade/bisq_v1/TradeUtil.java # core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java # core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java # core/src/main/java/bisq/core/trade/protocol/Provider.java # core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java # core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java # core/src/main/java/bisq/core/trade/protocol/TradeTaskRunner.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/DisputeProtocol.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/ProcessModel.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java # core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java # core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java # core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java # core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java # desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java # desktop/src/main/java/bisq/desktop/main/PriceUtil.java # desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java # desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java # desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java # desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java # desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java # desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java # desktop/src/main/java/bisq/desktop/main/offer/OfferView.java # desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferViewModel.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java # desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferViewModel.java # desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java # desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java # desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java # desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java # desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java # desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java # desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java # desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersDataModel.java # desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java # desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java # desktop/src/main/java/bisq/desktop/util/DisplayUtils.java # desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferDataModelTest.java # desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferViewModelTest.java # desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java # desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java # desktop/src/test/java/bisq/desktop/maker/OfferMaker.java # monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java		2021-11-02 16:04:12 +01:00
..
.tx	Merge core repository at 4597613	2018-09-05 10:48:22 +02:00
src	Merge branch 'chimp-bsq-swap-1' into bsq-swap-low-risk-refactorings-2	2021-11-02 16:04:12 +01:00
update_translations.sh	Update translations for v1.5.0 and adding Czech and Italian	2020-11-09 09:18:47 +01:00