mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-01 17:47:23 +01:00
Code Issues Projects Releases Packages Wiki Activity
3970 commits 3 branches 150 tags 4.1 GiB
Commit graph

102 commits

Author SHA1 Message Date
Mike Rosseel
0ffac07fd6 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:40:32 +02:00
Mike Rosseel
a0ecf38cf0 Revert "Revert "bisq -> Bisq"" 
This reverts commit 1dd3245347.
 2017-06-29 15:29:13 +02:00
Manfred Karrer
8718387c60 Remove policy file 2017-06-28 01:08:43 +02:00
Manfred Karrer
db5ce38c3c Use lower case for files 2017-06-28 01:00:49 +02:00
Manfred Karrer
68745ead08 Update icon for linux 2017-06-27 23:39:15 +02:00
Manfred Karrer
bb4181dd33 Update build script 2017-06-27 22:53:50 +02:00
Manfred Karrer
1da606dd1b Update build script 2017-06-27 22:48:56 +02:00
Manfred Karrer
0c99aacaa2 Update app icons 2017-06-27 10:53:47 +02:00
Manfred Karrer
e1e8c4a428 Update app icons and build scripts 2017-06-27 02:50:31 +02:00
Manfred Karrer
f268abe2e1 Merge DAO branch to Development branch 2017-06-27 01:30:24 +02:00
Manfred Karrer
e2fa679a68 Merge DAO branch to Development branch 2017-06-27 01:29:54 +02:00
Manfred Karrer
1037134ba9 Add BjvmOptions=-Xss1280k for linux builds 2017-06-24 16:04:02 +02:00
Manfred Karrer
f7993b61c2 Change version nr 0.5.0.0. to 0.5.0 2017-06-23 18:10:26 +02:00
Manfred Karrer
6ec49265fd Fix space 2017-05-18 16:10:47 +02:00
Manfred Karrer
e49b6b8783 Version 0.4.9.9.2 2017-05-18 15:41:48 +02:00
Manfred Karrer
e5585a1b3a Version 0.4.9.9.2 2017-05-18 00:44:43 +02:00
Manfred Karrer
dc1243bc78 Fix wrong path 2017-04-23 15:13:33 -05:00
Manfred Karrer
f84a038889 Version 0.4.9.9.1 2017-03-22 16:24:52 -05:00
Manfred Karrer
ae9016ca10 Remove policy flags 2017-03-16 11:59:00 -05:00
Manfred Karrer
3b557463da Rebranding: replace bitsquare with bisq 2017-03-12 16:00:40 -05:00
Manfred Karrer
75fc7d2286 Rebranding: Change occurance of Bitsquare to bisq 2017-03-12 14:28:14 -05:00
Mike Rosseel
f3d1c87d4e hand-merge of policyfile-dev branch 2017-02-20 17:04:17 +01:00
Mike Rosseel
26aa1ae48d Merge branch 'DAO' into policyfile 
Conflicts:
	package/mac/create_app.sh
	package/windows/32bitBuild.bat
	package/windows/64bitBuild.bat
 2017-02-20 15:16:13 +01:00
Manfred Karrer
d666490424 Set v 0.5.0.0, fix issues after merge. 2017-02-12 13:38:26 -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
28655e7062 Add copy task 2017-02-11 14:55:46 -05:00
Manfred Karrer
2ea5df3ba2 Change category to Network 2017-02-11 12:46:50 -05:00
Manfred Karrer
890c724a87 Prepare for v 0.4.9.9 2017-02-10 19:49:33 -05:00
Mike Rosseel
c672ba687d added docker file for testing 2017-01-25 12:37:23 +01:00
Mike Rosseel
b604da861e adding arguments to javapackager for all builds 2017-01-25 09:56:29 +01:00
Manfred Karrer
3bf4c60567 Prepare for v0.4.9.8 2016-11-19 14:36:23 +01:00
Manfred Karrer
22250574d8 Prepare for v 0.4.9.7 2016-10-19 22:04:46 +02:00
Manfred Karrer
f076a840f5 Remove jdkfix module (new jdk version 8_u_122 includes the SorteList bugfix) 2016-10-19 16:53:06 +02:00
Manfred Karrer
83d411eba5 Prepare v0.4.9.6 2016-09-03 10:34:48 -05:00
Manfred Karrer
a803077296 Prepare for v 0.4.9.5 2016-08-26 17:03:01 +02:00
Manfred Karrer
6034602f03 Disable rpm for linux64 build script 2016-08-26 15:54:27 +02:00
Manfred Karrer
349fb3c342 Enable rpm for linux64 2016-08-26 15:45:22 +02:00
Manfred Karrer
682e2d2d8e Remove rpm script 2016-08-25 00:40:42 +02:00
Manfred Karrer
7af384cb30 Prepare for 0.4.9.3 2016-08-23 15:38:08 +02:00
Manfred Karrer
1718f83d47 Update script 2016-08-08 03:51:31 +02:00
Manfred Karrer
4cefc45231 Update scripts 2016-08-07 05:34:10 +02:00
Manfred Karrer
7fd4dcc3e5 Update scripts (use alien for rpm) 2016-08-07 05:10:27 +02:00
Manfred Karrer
f7a7c4087b Prepare v 0.4.9.3 2016-08-07 04:17:13 +02:00
Manfred Karrer
31a1d7c0aa Add rpm packager (not tested yet) 2016-08-06 17:56:45 +02:00
Manfred Karrer
e3ce6e9125 Prepare for release 0.4.9.2 2016-07-30 00:32:40 +02:00
Manfred Karrer
11ebdf39d2 Set v 0.4.9.1 2016-07-25 19:37:01 +02:00
Manfred Karrer
70542acdeb Decrease delay at offermanager shutdown 2016-07-25 16:30:36 +02:00
Manfred Karrer
25b17e638f Merge remote-tracking branch 'origin/Development' into Development 2016-07-22 16:32:31 +02:00
Manfred Karrer
ddbbf6e998 Rename linux build scripts 2016-07-07 13:18:24 +02:00