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

416 commits

Author SHA1 Message Date
Manfred Karrer
5afd2bde11 Separate security deposit for buyer and seller. Remove arbitrator amount and address at dispute result. Remove Payout policy. Add bank as reason. 2017-03-15 17:06:44 -05:00
Manfred Karrer
a4b15f5906 Separate security deposit for buyer and seller (WIP) 2017-03-15 15:04:32 -05:00
Manfred Karrer
b008a5dd76 Fix wrong entry 2017-03-14 16:10:54 -05:00
Manfred Karrer
26159e4555 Remove display string popup.warning.noBountyCastle 2017-03-13 16:34:16 -05:00
Mike Rosseel
c6e51fdeca fix bug where the DisputeResult was not correctly deserialized. 
Added ctor with all transmitted data.
 2017-03-13 10:23:44 +01:00
Manfred Karrer
d68b3e4862 Add comments to translation files 2017-03-12 22:52:34 -05:00
Manfred Karrer
7949dc0f6e Add comments to translation files 2017-03-12 22:49:58 -05:00
Manfred Karrer
56db3c6217 Use maker instead of offerer and maker fee instead offer fee as well as taker fee instead "take offer fee" 2017-03-12 22:38:31 -05:00
Manfred Karrer
8527762154 Fix incorrect/missing display strings, fix null pointer, cleanup 2017-03-12 22:31:23 -05:00
Manfred Karrer
9ff23016c8 Fix incorrect display strings 2017-03-12 16:14:32 -05:00
Manfred Karrer
3b557463da Rebranding: replace bitsquare with bisq 2017-03-12 16:00:40 -05:00
Manfred Karrer
0435c88717 Add missing displaystrings 2017-03-12 15:59:59 -05:00
Manfred Karrer
be1096582c Rebranding: rename package io.bitsquare to io.bisq 2017-03-12 15:09:39 -05:00
Manfred Karrer
75fc7d2286 Rebranding: Change occurance of Bitsquare to bisq 2017-03-12 14:28:14 -05:00
Manfred Karrer
46995c102c Resolve merge conflicts, move locale package to common, use constancts for dev keypair. 2017-03-12 13:46:40 -05:00
Manfred Karrer
5b557ed37a Merge branch 'doa_with_translations' into DAO 
# Conflicts:
#	common/src/main/java/io/bitsquare/app/DevFlags.java
#	gui/src/main/java/io/bitsquare/gui/components/PeerInfoIcon.java
#	gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
#	gui/src/main/java/io/bitsquare/gui/components/paymentmethods/CryptoCurrencyForm.java
#	gui/src/main/java/io/bitsquare/gui/components/paymentmethods/OKPayForm.java
#	gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java
#	gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java
#	gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SameBankForm.java
#	gui/src/main/java/io/bitsquare/gui/main/MainView.java
#	gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
#	gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
#	gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java
#	gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java
#	gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
#	gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
#	gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java
#	gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.java
#	gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java
#	gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
#	gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
#	gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.java
#	gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
#	gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
#	gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.java
#	gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/editor/PeerInfoWithTagEditor.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ContractWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/FilterWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendPrivateNotificationWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
#	gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
#	gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
#	gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java
#	gui/src/main/java/io/bitsquare/gui/util/validation/BankIdValidator.java
#	gui/src/main/java/io/bitsquare/gui/util/validation/BranchIdValidator.java
#	gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
#	gui/src/main/java/io/bitsquare/gui/util/validation/SecurityDepositValidator.java
#	network/src/main/java/io/bitsquare/messages/provider/price/PriceFeedService.java
#	network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java
 2017-03-12 12:50:36 -05:00
Manfred Karrer
1a634d919f cleanup 2017-03-12 12:23:53 -05:00
Manfred Karrer
9d8b3ed6eb Apply display strings for dao 2017-03-11 18:23:53 -05:00
Manfred Karrer
f01d461abe Add dev keys for alert, priv. notification and filter. add comments to devflags 2017-03-10 20:44:51 -05:00
Mike Rosseel
888a6da827 revert log to DAO version 2017-03-10 16:48:27 +01:00
Mike Rosseel
9fdd636f7d fix disputeResult protobuffer handling 2017-03-10 16:28:25 +01:00
Manfred Karrer
c6b5cbda02 Apply displaystring for create offer and take offer views 2017-03-07 23:12:24 -05:00
Mike Rosseel
fed47a0342 Merge branch 'DAO' into protobuffer 
Conflicts:
	common/src/main/java/io/bitsquare/app/Log.java
	core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java
	core/src/main/java/io/bitsquare/btc/BitcoinModule.java
	core/src/main/java/io/bitsquare/btc/wallet/BsqWalletService.java
	core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java
	core/src/main/java/io/bitsquare/btc/wallet/WalletService.java
	core/src/main/java/io/bitsquare/btc/wallet/WalletsSetup.java
	core/src/main/java/io/bitsquare/dao/DaoModule.java
	core/src/main/java/io/bitsquare/dao/vote/VotingManager.java
	gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
	gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java
	gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.java
	gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/VoteView.java
	gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java
	gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
	gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
	gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java
	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
	gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java
	network/pom.xml
	network/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
	network/src/main/java/io/bitsquare/messages/alert/Alert.java
	network/src/main/java/io/bitsquare/messages/btc/provider/fee/FeeService.java
	network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java
	network/src/main/java/io/bitsquare/messages/user/Preferences.java
	network/src/main/java/io/bitsquare/p2p/network/Connection.java
	pom.xml
	statistics/src/main/java/io/bitsquare/statistics/Statistics.java
 2017-03-07 16:40:57 +01:00
Mike Rosseel
e06db65629 fix various mailbox related errors 2017-03-06 12:21:45 +01:00
Manfred Karrer
e553a038f5 Add DevFlags.DEV_ARBITRATOR to support dev keys. Autofill key if DEV_ARBITRATOR is set 2017-03-03 18:37:33 -05:00
Manfred Karrer
4a52ad5be1 Add comment 2017-03-03 10:39:47 -05:00
Manfred Karrer
002211b7f6 Reset sub version nr to 1 2017-03-03 10:38:28 -05:00
Manfred Karrer
28a704ed85 Fix bug with backup path when path became invalid. Improve backup handling and UI. 2017-03-01 20:46:17 -05:00
Mike Rosseel
c25e083cbe fix protobuffer bugs, nullcheck for truncatedString utility 2017-03-01 16:28:27 +01:00
Mike Rosseel
cc08e31546 logging changes 2017-03-01 16:26:40 +01:00
Mike Rosseel
5b5329ffd4 fix string interning problem by removing Utilities.serialize calls and doing signing also with protobuffer 2017-03-01 09:20:13 +01:00
Manfred Karrer
16ca619057 Overwrite first with random bytes before setting aesKey null 2017-02-21 09:45:56 -05:00
Mike Rosseel
5d6537a0d2 Removed the spring bug fix class because upgrading to 4.3.6-RELEASE fixed the bug + no more confusion on import between the two classes. Bitsquare now starts again, P2P to be tested 2017-02-20 09:50:09 +01:00
Manfred Karrer
aa084dba28 User percentage based trade fee as well as market price based factor. Display % in fee info popups. 2017-02-19 13:40:47 -05:00
Mike Rosseel
92323ce561 moving app classes to make it start again. 2017-02-17 14:46:06 +01:00
Mike Rosseel
a3b31ce32b moving app classes to make it start again. 2017-02-17 14:45:03 +01:00
Mike Rosseel
b8a68658b0 fromProtoBuf is code complete 2017-02-16 09:04:23 +01:00
Mike Rosseel
22d5d5267b compiles again 2017-02-14 17:33:35 +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
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
6281ecc7e2 Version 0.4.9.9 2017-02-11 21:17:39 -05:00
Manfred Karrer
e2e038b4e7 v0.4.9.9 2017-02-11 19:25:51 -05:00
Manfred Karrer
890c724a87 Prepare for v 0.4.9.9 2017-02-10 19:49:33 -05:00
Mike Rosseel
6c6937f61f add maven dependency check plugin 2017-02-09 16:22:45 +01:00
Mike Rosseel
104914a4de adding new/moved files 2017-02-09 12:32:50 +01:00
Mike Rosseel
daa5557385 fromProto 50% done, not compiling 2017-02-09 12:23:15 +01:00
Manfred Karrer
ea4fc12092 Use dash instead of underscore for offer id 2017-02-07 20:24:44 -05:00
Manfred Karrer
4cafddabc7 Add version nr to offer id, use more randomized prefix for short id 2017-02-07 19:44:45 -05:00
Manfred Karrer
d65e098933 Increase tx fee to 0.0007 btc, increase tradeprotocol version, change log level for tx details to INFO 2017-02-07 18:47:20 -05:00
Mike Rosseel
219ea61f85 all toProto implemented on messages and payloads, remaining: fromProto 2017-02-07 08:54:04 +01:00