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

28 commits

Author SHA1 Message Date
Manfred Karrer
f7993b61c2 Change version nr 0.5.0.0. to 0.5.0 2017-06-23 18:10:26 +02:00
Manfred Karrer
9aba9e607a Make tx fee dynamic by base currency 2017-06-13 07:35:35 +02:00
Manfred Karrer
ed6b2d9974 Add LtcFeesProvider 2017-06-12 21:15:17 +02:00
Manfred Karrer
e86edd8384 Migrate old trade statistic db to new data structure. 
Use SignaturePubKeyBytes instead of PubKeyRing in TradeStatistics.
Use PersistedEntryMap instead of PersistableHashMap.
Use bytes as Hex encoded instead of toString call.
Use ConcurrentHashMap for SequenceNumberMap and PersistedEntryMap
 2017-06-08 23:47:55 +02:00
Manfred Karrer
65285bfe30 Apply code inspection 2017-06-08 18:02:05 +02:00
Manfred Karrer
37f8cb8127 Fix issues with dispute, trade, userpayload, persistance 2017-06-02 18:55:17 +02:00
Manfred Karrer
9485971751 Check for market price age on client. Allow max. 30 min old market prices 2017-03-26 23:11:40 -05:00
Manfred Karrer
6790eec935 Remove marketPriceTypes. Use last price in all cases (no bid and ask) 2017-03-20 00:59:20 -05:00
Manfred Karrer
eb6360dffa Add null checks 2017-03-18 17:17:54 -05:00
Manfred Karrer
07d428de6f Use base package iwth same name as module in all modules. 2017-03-16 21:12:06 -05:00
Manfred Karrer
28eed63e0f Move provider and app package form network to core 2017-03-16 17:00:09 -05:00
Manfred Karrer
f31dd06330 Merge branch 'MarketPriceTTL' into DAO 2017-03-16 13:03:03 -05:00
Mike Rosseel
2efc3acb29 split network-messages in its own module. Compiles. 2017-03-16 14:38:18 +01:00
Manfred Karrer
97957663fd Use TTL of 30 min. for market prices. 2017-03-15 11:12:34 -05:00
Manfred Karrer
3b557463da Rebranding: replace bitsquare with bisq 2017-03-12 16:00:40 -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
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
a3b31ce32b moving app classes to make it start again. 2017-02-17 14:45:03 +01:00
Manfred Karrer
0580e73179 Use new tx and trade fees. UI improvements, remove trade fee from provider data 2017-02-16 15:43:38 -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
Mike Rosseel
daa5557385 fromProto 50% done, not compiling 2017-02-09 12:23:15 +01:00
Manfred Karrer
1fd526199d Add bitcoind rpc service for requesting blocks. Add params in voting. Change UI for voting. (WIP) 2017-01-08 22:09:41 +01:00
Manfred Karrer
6f9e7af7b0 Move uid to HttpClient, cleanup 2016-12-05 23:50:09 +01:00
Manfred Karrer
5fd2839e24 Move mining fee payment to taker. Refactor package io.bitsquare.pricefeed to io.bitsquare.provider.price. Rename option priceFeedProviders to providers 2016-12-05 17:40:47 +01:00
Manfred Karrer
963086106f Move mining fee payment to taker. Refactor package io.bitsquare.pricefeed to io.bitsquare.provider.price. Rename option priceFeedProviders to providers 2016-12-05 17:25:50 +01:00