Mike Rosseel 99775eb437 Merge branch 'Development' into issue544-api ... Conflicts: api/src/main/java/io/bisq/api/app/Api.java api/src/main/java/io/bisq/api/app/ApiModule.java common/src/main/java/io/bisq/common/app/Version.java common/src/main/java/io/bisq/common/crypto/PGP.java common/src/main/java/io/bisq/common/locale/BankUtil.java common/src/main/java/io/bisq/common/locale/CurrencyUtil.java common/src/main/java/io/bisq/common/locale/LanguageUtil.java common/src/main/java/io/bisq/common/locale/Res.java common/src/main/java/io/bisq/common/proto/ProtoUtil.java common/src/main/java/io/bisq/common/storage/FileManager.java common/src/main/java/io/bisq/common/storage/Storage.java common/src/main/proto/pb.proto common/src/main/resources/i18n/displayStrings.properties common/src/main/resources/i18n/displayStrings_de.properties common/src/main/resources/i18n/displayStrings_es.properties common/src/main/resources/i18n/displayStrings_sr.properties common/src/main/resources/i18n/in_dev/displayStrings_es.properties core/src/main/java/io/bisq/core/alert/Alert.java core/src/main/java/io/bisq/core/app/BisqEnvironment.java core/src/main/java/io/bisq/core/app/BisqExecutable.java core/src/main/java/io/bisq/core/arbitration/messages/DisputeCommunicationMessage.java core/src/main/java/io/bisq/core/btc/wallet/BisqDefaultCoinSelector.java core/src/main/java/io/bisq/core/btc/wallet/BisqDeterministicKeyChain.java core/src/main/java/io/bisq/core/btc/wallet/BsqWalletService.java core/src/main/java/io/bisq/core/btc/wallet/BtcDeterministicKeyChain.java core/src/main/java/io/bisq/core/btc/wallet/TradeWalletService.java core/src/main/java/io/bisq/core/btc/wallet/WalletConfig.java core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java core/src/main/java/io/bisq/core/dao/DaoPeriodService.java core/src/main/java/io/bisq/core/dao/blockchain/BsqFullNode.java core/src/main/java/io/bisq/core/dao/blockchain/BsqLiteNode.java core/src/main/java/io/bisq/core/dao/blockchain/BsqNode.java core/src/main/java/io/bisq/core/dao/blockchain/btcd/PubKeyScript.java core/src/main/java/io/bisq/core/dao/blockchain/btcd/ScriptTypes.java core/src/main/java/io/bisq/core/dao/blockchain/json/JsonSpentInfo.java core/src/main/java/io/bisq/core/dao/blockchain/parse/BsqChainState.java core/src/main/java/io/bisq/core/dao/blockchain/parse/BsqFullNodeExecutor.java core/src/main/java/io/bisq/core/dao/blockchain/parse/BsqParser.java core/src/main/java/io/bisq/core/dao/blockchain/parse/IssuanceVerification.java core/src/main/java/io/bisq/core/dao/blockchain/parse/OpReturnVerification.java core/src/main/java/io/bisq/core/dao/blockchain/parse/RpcService.java core/src/main/java/io/bisq/core/dao/blockchain/vo/TxOutputType.java core/src/main/java/io/bisq/core/dao/vote/VotingDefaultValues.java core/src/main/java/io/bisq/core/filter/Filter.java core/src/main/java/io/bisq/core/offer/OfferPayload.java core/src/main/java/io/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java core/src/main/java/io/bisq/core/payment/FasterPaymentsAccount.java core/src/main/java/io/bisq/core/payment/NationalBankAccount.java core/src/main/java/io/bisq/core/payment/PaymentAccountList.java core/src/main/java/io/bisq/core/payment/SameBankAccount.java core/src/main/java/io/bisq/core/payment/SepaAccount.java core/src/main/java/io/bisq/core/payment/SpecificBanksAccount.java core/src/main/java/io/bisq/core/payment/payload/BankAccountPayload.java core/src/main/java/io/bisq/core/payment/payload/CashDepositAccountPayload.java core/src/main/java/io/bisq/core/payment/payload/FasterPaymentsAccountPayload.java core/src/main/java/io/bisq/core/payment/payload/NationalBankAccountPayload.java core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java core/src/main/java/io/bisq/core/payment/payload/SameBankAccountPayload.java core/src/main/java/io/bisq/core/payment/payload/SepaAccountPayload.java core/src/main/java/io/bisq/core/payment/payload/SpecificBanksAccountPayload.java core/src/main/java/io/bisq/core/trade/Trade.java core/src/main/java/io/bisq/core/trade/protocol/SellerAsMakerProtocol.java core/src/main/java/io/bisq/core/trade/protocol/tasks/CheckIfPeerIsBanned.java core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignAndPublishDepositTx.java core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessDepositTxPublishedMessage.java core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessPayDepositRequest.java core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerVerifyArbitratorSelection.java core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerVerifyMediatorSelection.java core/src/main/java/io/bisq/core/trade/protocol/tasks/seller/SellerProcessCounterCurrencyTransferStartedMessage.java core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/CreateTakerFeeTx.java core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerProcessPublishDepositTxRequest.java core/src/main/java/io/bisq/core/user/PreferencesPayload.java core/src/main/resources/bisq.policy core/src/test/java/io/bisq/core/arbitration/ArbitratorTest.java core/src/test/java/io/bisq/core/dao/vote/VoteManagerTest.java core/src/test/java/io/bisq/core/dao/vote/VotingDefaultValuesTest.java core/src/test/java/io/bisq/core/payment/OKPayAccountPayloadTest.java core/src/test/java/io/bisq/core/trade/TradableListTest.java core/src/test/java/io/bisq/core/util/ProtoUtilTest.java doc/CONTRIBUTING.md doc/bisq-sn.cron.sh doc/bisq-sn.init.sh doc/build.md doc/install_on_unix.sh doc/monitor-bisq-sn.cron.sh doc/protobuffer.md doc/seed-node-daemon.md gui/src/main/java/io/bisq/gui/app/BisqApp.java gui/src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/NationalBankForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/SameBankForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/SpecificBankForm.java gui/src/main/java/io/bisq/gui/main/MainView.java gui/src/main/java/io/bisq/gui/main/MainViewModel.java gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.java gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml gui/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml gui/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxListItem.java gui/src/main/java/io/bisq/gui/main/debug/DebugView.java gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.java gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java gui/src/main/java/io/bisq/gui/main/overlays/windows/AddBitcoinNodesWindow.java gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java gui/src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java gui/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java gui/src/main/java/io/bisq/gui/util/GUIUtil.java gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java gui/src/main/java/io/bisq/gui/util/validation/FiatPriceValidator.java gui/src/main/java/io/bisq/gui/util/validation/altcoins/OctocoinAddressValidator.java gui/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java jtorproxy/src/main/java/io/nucleo/net/Connection.java jtorproxy/src/main/java/io/nucleo/net/Node.java network/pom.xml network/src/main/java/io/bisq/network/Socks5ProxyProvider.java network/src/main/java/io/bisq/network/Socks5SeedOnionDiscovery.java network/src/main/java/io/bisq/network/p2p/storage/payload/ExpirablePayload.java network/src/main/java/io/bisq/network/p2p/storage/payload/MailboxStoragePayload.java network/src/main/java/io/bisq/network/p2p/storage/payload/RequiresOwnerIsOnlinePayload.java network/src/main/java/io/bisq/network/p2p/storage/payload/StoragePayload.java network/src/main/resources/PersistedEntryMap network/src/test/java/io/bisq/network/crypto/EncryptionServiceTests.java network/src/test/java/io/bisq/network/p2p/network/NetworkStressTest.java network/src/test/java/io/bisq/network/p2p/storage/P2PDataStorageTest.java package/linux/32bitBuild.sh package/linux/64bitBuild.sh package/mac/bisq.icns package/mac/bisq.iconset/icon_128x128.png package/mac/bisq.iconset/icon_128x128@2x.png package/mac/bisq.iconset/icon_16x16.png package/mac/bisq.iconset/icon_16x16@2x.png package/mac/bisq.iconset/icon_256x256.png package/mac/bisq.iconset/icon_256x256@2x.png package/mac/bisq.iconset/icon_32x32.png package/mac/bisq.iconset/icon_32x32@2x.png package/mac/bisq.iconset/icon_512x512.png package/mac/bisq.iconset/icon_512x512@2x.png package/mac/create_app.sh package/osx/Info.plist package/osx/finalize.sh package/windows/32bitBuild.bat package/windows/64bitBuild.bat package/windows/bisq-setup-icon.bmp package/windows/bisq.ico pom.xml provider/src/main/java/io/bisq/provider/fee/FeeRequestService.java provider/src/main/java/io/bisq/provider/price/PriceRequestService.java statistics/src/main/java/io/bisq/statistics/Statistics.java statistics/src/main/java/io/bitsquare/statistics/Statistics.java statistics/src/main/resources/logback.xml		2017-06-29 16:46:17 +02:00
..
src	Merge branch 'Development' into issue544-api	2017-06-29 16:40:32 +02:00
pom.xml	Merge branch 'Development' into issue544-api	2017-06-29 16:46:17 +02:00