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

122 commits

Author SHA1 Message Date
Mike Rosseel
cea1c0c778 VoteItemsList added, paymentaccount debugging 2017-04-27 16:34:39 +02:00
Mike Rosseel
c7e765d52c Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/proto/CoreNetworkProtoResolver.java
 2017-04-24 15:33:25 +02:00
Manfred Karrer
c8c900e190 Update build files (add protobuffer dependency) 2017-04-23 13:04:45 -05:00
Manfred Karrer
6b5ae740f5 Add ScriptTypes: witness_v0_keyhash and witness_v0_scripthash. Use testnet genesis tx. Use version 0.5.8.1. of btcd rpc lib. Update docs 2017-04-22 01:02:18 -05:00
Manfred Karrer
2a66600009 Update build docs 2017-04-21 15:54:37 -05:00
Mike Rosseel
b878389c25 Merge branch 'DAO' into disk-protobuffer 
Conflicts:
	bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java
	common/src/main/java/io/bisq/common/storage/FileManager.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
	gui/src/main/java/io/bisq/gui/app/BisqAppModule.java
	seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java
 2017-04-18 09:36:12 +02:00
Mike Rosseel
25d2366b71 user disk saving 2017-04-18 09:31:36 +02:00
Manfred Karrer
905ca65f33 Use mutable state object and immutable blockchain value objects (WIP) 2017-04-14 23:39:26 -05:00
Mike Rosseel
d1a3346cb2 protobuffer docs 2017-03-21 16:09:46 +01:00
Mike Rosseel
4eedfd22b4 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	wire/src/main/proto/bsmessage.proto
 2017-03-21 16:07:28 +01:00
Manfred Karrer
3e91b89bbd Rename network-messages module to wire. Further refactorings. 2017-03-16 20:35:46 -05:00
Mike Rosseel
2efc3acb29 split network-messages in its own module. Compiles. 2017-03-16 14:38:18 +01:00
Mike Rosseel
2ad93c0ac5 protobuffer documentation WIP 2017-03-13 15:57:28 +01: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
8debc1a0f3 Add note for Intellij 14 2017-03-10 19:43:20 -05:00
Manfred Karrer
835373878e Add requirements for protobuffer to build.md 2017-03-10 19:42:09 -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
Manfred Karrer
55472fd280 Update jdk version in doc files 2017-03-04 17:19:31 -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
b8a68658b0 fromProtoBuf is code complete 2017-02-16 09:04:23 +01: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
c1496086c8 Add rpc files 2017-02-12 12:14:05 -05:00
Manfred Karrer
71f98a5d28 Update install script 2017-02-11 18:18:41 -05:00
Manfred Karrer
8b25b59f39 Add install instruction for java on linux 2017-02-09 22:09:05 -05:00
Manfred Karrer
f6c4ac9143 Use jdk 1.8.0_121, update build scripts 2017-02-07 18:46:11 -05:00
Manfred Karrer
d88aceddf8 Clean up, add missing coins (LTBcoin, SFSC) 2017-02-07 10:05:15 -05:00
Mike Rosseel
219ea61f85 all toProto implemented on messages and payloads, remaining: fromProto 2017-02-07 08:54:04 +01:00
Mike Rosseel
dd17069b1e working ping/pong 2017-01-30 07:53:52 +01:00
Manfred Karrer
7f978832fe Add Contributing notes 2017-01-03 12:29:18 +01:00
Manfred Karrer
aeb72b26da update dev scripts 2016-11-19 18:07:44 +01:00
Manfred Karrer
9ab423619c Update BitcoinJ to 0.13.1.7 2016-11-19 14:31:41 +01:00
Manfred Karrer
4dbd3a03c8 Rename btcSeedNodes prog. arg to btcNodes 2016-11-14 15:17:05 +01:00
Manfred Karrer
00f17c6d14 Add log for trade state, improve install doc 2016-11-12 12:50:49 +01:00
Manfred Karrer
9440ecdf7d Merge branch 'master' into Development 2016-10-28 18:26:32 +02:00
Manfred Karrer
b6948f9523 Add install comments 2016-10-28 18:26:13 +02:00
Manfred Karrer
f9a7d2c837 Set default value for insertPubKey flag to false. Update to BitcoinJ version 0.13.1.6 2016-10-25 03:53:45 +02:00
Rob Judd
402208f48b Fix documentation Java version 112 iss #657 2016-10-20 19:15:44 +10:00
Manfred Karrer
0a28cefff6 Require min. java verison 1.8.0_122 (includes SortedList bugfix) 2016-10-19 16:54: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
Rob Judd
62661212f2 Crypto security update 2016-10-19 15:38:53 +10:00
Manfred Karrer
8236a21348 Merge branch 'master' into Development 
Conflicts:
	doc/build.md
 2016-10-18 20:45:59 +02:00
Jonathan Cross
7a11be43a4
Build notes: Mac OSX, jdkfix updates and move JCE unlimited Strength to extern link 2016-10-18 19:06:42 +02:00
bitsgh
e61d02a507 Fix "BountyCastle" typos to "BouncyCastle" 2016-10-09 00:14:11 +01:00
Manfred Karrer
9bd2a9b55e Merge branch 'master' into Development 
Conflicts:
	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
 2016-10-06 10:45:38 +02:00
Jonathan Cross
b4df0120dd
Updating build notes with info from Linux Mint 17.3 2016-10-06 04:03:36 +02:00
Manfred Karrer
ce250ebd40 Improve wording 2016-10-06 00:10:42 +02:00
ligi
be737dd6fe Fix the path - after step #3 we are already in bitsquare/ 2016-09-30 17:26:13 +02:00
Manfred Karrer
83d411eba5 Prepare v0.4.9.6 2016-09-03 10:34:48 -05:00