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
|
3fd747efad
|
Version 0.5.0
|
2017-06-28 14:11:49 +02:00 |
|
Manfred Karrer
|
d128b9dd6f
|
Fix script
|
2017-06-28 10:47:10 +02:00 |
|
Manfred Karrer
|
e5940ab142
|
Fix icon path for windoze
|
2017-06-28 01:54:34 +02:00 |
|
Manfred Karrer
|
863528389d
|
Fix icon path for windoze
|
2017-06-28 01:51:34 +02:00 |
|
Manfred Karrer
|
d327acfa6d
|
Fix paths, icon name
|
2017-06-28 01:14:04 +02:00 |
|
Manfred Karrer
|
8718387c60
|
Remove policy file
|
2017-06-28 01:08:43 +02:00 |
|
Manfred Karrer
|
59f1ca76e5
|
Rename file
|
2017-06-28 01:03:23 +02:00 |
|
Manfred Karrer
|
aab806db28
|
Rename file
|
2017-06-28 01:03:09 +02:00 |
|
Manfred Karrer
|
db5ce38c3c
|
Use lower case for files
|
2017-06-28 01:00:49 +02:00 |
|
Manfred Karrer
|
4c46293373
|
Fix git ignore (bat was ignored!)
|
2017-06-28 00:54:58 +02:00 |
|
Manfred Karrer
|
4fafe3ce04
|
Git issues WIP
|
2017-06-28 00:42:26 +02:00 |
|
Manfred Karrer
|
61c65264c7
|
Git issues WIP
|
2017-06-28 00:42:01 +02:00 |
|
Manfred Karrer
|
43e05d271e
|
Rename dir
|
2017-06-28 00:38:08 +02:00 |
|
Manfred Karrer
|
2b665b64fb
|
Add icons
|
2017-06-28 00:36:58 +02:00 |
|
Manfred Karrer
|
cf46aa2b13
|
rename dir
|
2017-06-28 00:36:12 +02:00 |
|
Manfred Karrer
|
373ba4ed40
|
Use uppercase for Bisq
|
2017-06-28 00:33:27 +02:00 |
|
Manfred Karrer
|
06724da4bd
|
Update build files
|
2017-06-28 00:22:23 +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
|
ae7aca48d2
|
Update app icons and build scripts
|
2017-06-27 02:50: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
|
bce4d589b6
|
Fix icon path
|
2017-06-04 21:26:06 +02:00 |
|
Silvio Marano
|
3cc78f2ecf
|
Update Bitsquare.iss
|
2017-06-04 20:03:51 +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
|
35363b2725
|
Remove policy flags
|
2017-03-16 11:59:29 -05:00 |
|
Manfred Karrer
|
f677e7f6a4
|
change to io.bisq.bisq ID
|
2017-03-16 11:59:15 -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 |
|
Manfred Karrer
|
9f5b7f693b
|
Use for Winows build no version nr at jar files to avoid collecting multiple jars at updates
|
2017-02-21 11:57:30 -05:00 |
|
Manfred Karrer
|
159b208273
|
Add btcd-cli4j lib as local build jar instead of using http repo. Add exclude for diff. version dependencies.
|
2017-02-20 14:29:58 -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
|
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
|
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
|
80ec899bad
|
update win build script
|
2017-02-11 20:06:20 -05:00 |
|
