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
3255 commits 3 branches 150 tags 4.1 GiB
Commit graph

46 commits

Author SHA1 Message Date
Mike Rosseel
22d5e7ad05 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:41:23 +01: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
5b5329ffd4 fix string interning problem by removing Utilities.serialize calls and doing signing also with protobuffer 2017-03-01 09:20:13 +01: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
d666490424 Set v 0.5.0.0, fix issues after merge. 2017-02-12 13:38:26 -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
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
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
7af384cb30 Prepare for 0.4.9.3 2016-08-23 15:38:08 +02:00
Manfred Karrer
f7a7c4087b Prepare v 0.4.9.3 2016-08-07 04:17:13 +02:00
Manfred Karrer
e3ce6e9125 Prepare for release 0.4.9.2 2016-07-30 00:32:40 +02:00
Manfred Karrer
5362b14b87 Merge pull request #545 from dan-da/price_providers_socks5_522 
Route HttpClient over Socks5 Proxy, with remote DNS resolution.
 2016-07-26 12:18:15 +02:00
danda
909bf4cab1 route HttpClient over Socks5 proxy. requires apache http client. work in progress. 2016-07-25 17:04:18 -07:00
Manfred Karrer
11ebdf39d2 Set v 0.4.9.1 2016-07-25 19:37:01 +02:00
Manfred Karrer
ca9eee895f v0.4.9 2016-06-17 01:54:38 +02:00
Manfred Karrer
638d1ab916 Version 0.4.8 (bugfix with XMR) 2016-05-25 21:13:59 +02:00
Manfred Karrer
a9de00f34b v0.4.7 2016-05-25 15:56:05 +02:00
Manfred Karrer
89aed23d67 v0.4.6 2016-04-29 11:22:58 +02:00
Manfred Karrer
dd5cacb26f Version 0.4.5 2016-04-28 22:24:51 +02:00
Manfred Karrer
4e09428180 Beta version 0.4.4 2016-04-26 17:29:11 +02:00
Manfred Karrer
24b109421f Version 0.4.3 2016-04-23 00:12:20 +02:00
Manfred Karrer
c02f6481b2 v0.4.2, new seednodes 2016-04-16 22:36:34 +02:00
Manfred Karrer
7e3d2356da v0.4.1 2016-04-13 18:38:51 +02:00
Manfred Karrer
04e0935516 Start version 0.4.1 2016-04-09 03:44:00 +02:00
Manfred Karrer
333d0bf789 Version 0.4.0 2016-04-08 22:53:38 +02:00
Manfred Karrer
5d4d7607f3 Start 0.3.7-SNAPSHOT 2016-03-20 17:28:48 +01:00
Manfred Karrer
c4a1105c09 Version 0.3.6 2016-03-20 13:38:09 +01:00
Manfred Karrer
b4581ae698 Start for version 0.3.6-SNAPSHOT 2016-03-15 14:47:36 +01:00
Manfred Karrer
62d4d50392 Version 0.3.5 2016-03-11 17:20:58 +01:00
Manfred Karrer
30f7ca69f8 Start v0.3.5-SNAPSHOT 2016-02-09 01:46:53 +01:00
Manfred Karrer
86284fe644 v0.3.4 2016-02-09 00:36:59 +01:00
Manfred Karrer
87e2119b84 Allow sorting in tables 2016-01-28 13:26:57 +01:00
Manfred Karrer
495616edea version 0.3.3 2016-01-27 19:02:01 +01:00
Manfred Karrer
9653ff8437 remove maintainancemanager, adopt fees, adopt timer delays, v. 0.3.2.3 2016-01-14 14:05:52 +01:00
Manfred Karrer
c2dbd55e77 Remove walletprefix, fix key event listener, v 0.3.2.23-snapshot 2015-12-29 00:36:19 +01:00
Manfred Karrer
2701af82bc Version 0.3.2.2 2015-12-28 13:33:58 +01:00
Manfred Karrer
b1c4d7b636 change pom files for 0.3.2.2-SNAPSHOT 2015-12-20 20:20:14 +01:00
Manfred Karrer
5b4a360b26 RC version 0.3.1 2015-11-18 17:32:02 +01:00
Manfred Karrer
f8adaaed62 Cleanup dependencies 2015-11-11 18:25:07 +01:00
Manfred Karrer
8347b9f572 add tor sub projects as modules 2015-11-06 00:43:21 +01:00
Manfred Karrer
3f42e5305a move libs to resources, add missing jars 2015-11-03 21:26:35 +01:00
Manfred Karrer
c5ee2c9186 added jars, fixed tests 2015-11-03 15:34:04 +01:00
Manfred Karrer
9ef8b42509 add missing files 2015-10-28 13:34:03 +01:00