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

1249 commits

Author SHA1 Message Date
Manfred Karrer
50329567bd Increase non trade tx fee default value. change upper limit for tx fee. increase width of data column in arbitr. screen 2017-03-22 13:04:13 -05:00
Manfred Karrer
b2a85d65f3 Merge branch 'master' into Development 
# Conflicts:
#	pom.xml
 2017-03-22 12:14:42 -05:00
Manfred Karrer
6348c9c70a Cleanup 2017-03-22 11:55:15 -05:00
Mike Rosseel
ee51d8793e transaction replaced by transactionid, some lombok work 2017-03-22 16:50:31 +01:00
Mike Rosseel
68265aabf0 voteitemlist no longer extends ArrayList 2017-03-22 16:23:55 +01:00
Manfred Karrer
9e085102c8 Move getBaseEnvelope to Message. Cleanup 2017-03-21 23:28:43 -05:00
Manfred Karrer
552a151516 Add vo module. Refactor Alert to separated classes for all differnet domains (core, vo, proto, payload, persistable) 2017-03-21 23:10:55 -05: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
Mike Rosseel
81cf311bc7 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	wire/src/main/proto/bsmessage.proto
 2017-03-21 16:07:04 +01:00
Mike Rosseel
00987dadf7 wip 2017-03-21 07:58:39 +01:00
Manfred Karrer
de7b73f7a9 Remove default values in case of null, apply Lombok annotations 2017-03-20 23:28:09 -05:00
Manfred Karrer
5fee4b0b66 Add missing equals/hashcode to Offer 2017-03-20 22:31:18 -05:00
Manfred Karrer
93531c76d0 Apply Lombok annotations, cleanup, check hashcode and equals methods 2017-03-20 22:10:10 -05:00
Manfred Karrer
63bf1942e4 Add extraDataMap field to all StoragePayload objects 2017-03-20 16:27:54 -05:00
Manfred Karrer
a41d13a093 Remove unused fields 2017-03-20 08:59:48 -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
0c88f204a2 Fix wrong monetaryFormat 2017-03-20 00:37:30 -05:00
Manfred Karrer
48446e454a Refactor price handling 2017-03-19 23:44:58 -05:00
Manfred Karrer
f2c9ff247b Use normal rolling backup in case of restore (support correct handling of pw change - to delete unencrypted backups). 2017-03-18 12:42:29 -05:00
Manfred Karrer
e65a6adb77 Refactor: Rename ContractData to Payload. 2017-03-17 16:55:44 -05:00
Manfred Karrer
a6eae2745b Refactor OptionKeys 2017-03-17 15:42:52 -05:00
Manfred Karrer
4d784d64fa Refactoring: Remove further dependencies to OfferPayload. Rename Offer in protobuffer definition to PB_Offer 2017-03-17 14:21:03 -05:00
Manfred Karrer
0b0be0bb02 Refactor Offer.Direction: Remove dependencies to OfferPayload (WIP) 2017-03-17 13:19:36 -05:00
Manfred Karrer
d793d6732b Refactor Offer and OfferPayload: Make OfferPayload pure value object 2017-03-17 12:49:26 -05:00
Mike Rosseel
e92fd88d52 delegate test 2017-03-17 16:52:27 +01:00
Manfred Karrer
524a176305 setAddPeersFromAddressMessage 2017-03-17 00:44:32 -05:00
Manfred Karrer
30e91ea0ee Dont use peers from AddressMessage calls in btcj if we have set our own node addresses or use localhost. 2017-03-17 00:44:01 -05:00
Manfred Karrer
af48575b7f Apply code inspection 2017-03-16 22:01:25 -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
3e91b89bbd Rename network-messages module to wire. Further refactorings. 2017-03-16 20:35:46 -05:00
Manfred Karrer
3c9111441e Refactor package structure in network-message module. Move domain objects as far as possible. 2017-03-16 20:03:14 -05:00
Manfred Karrer
dcf71b8196 Refactor package structure in network-message module. Move domain object to core. Add readObject to Offer again 2017-03-16 18:45:48 -05:00
Manfred Karrer
0ce87da0f4 Move trade exceptions back to core 2017-03-16 17:41:50 -05:00
Manfred Karrer
28eed63e0f Move provider and app package form network to core 2017-03-16 17:00:09 -05:00
Manfred Karrer
f174024ac7 Move local to common, refactor setting of default locale 2017-03-16 16:56:47 -05:00
Manfred Karrer
63456ac255 Move Offer and User domain classes to core 2017-03-16 16:37:37 -05:00
Manfred Karrer
23b86922ad Fix missing impl at Utilities.getFeePerByte. Move btcj dependent methods from common Utilities to CoinUtil in core. 2017-03-16 13:26:58 -05:00
Manfred Karrer
ccb060193e Adpot changes to merged branch 2017-03-16 12:59:17 -05:00
Manfred Karrer
34b4c61792 Merge branch 'separateSecDeposit' into DAO 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
#	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java
#	gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java
#	network-messages/src/main/java/io/bisq/network_messages/trade/offer/payload/OfferPayload.java
#	network/src/main/java/io/bisq/p2p/network/ProtoBufferUtilities.java
#	network/src/test/java/io/bisq/p2p/storage/P2PDataStorageTest.java
 2017-03-16 12:28:59 -05:00
Manfred Karrer
ae2cdcae72 Merge branch 'temp' into DAO 2017-03-16 12:22:00 -05:00
Manfred Karrer
366522444d Fix bug with missing !. Use equals check instead of != check for networkParams 2017-03-16 12:00:38 -05:00
Mike Rosseel
4a56abbf0b renamed package name to conform to module 2017-03-16 16:57:21 +01:00
Mike Rosseel
d89e8e98d1 move the last messages to the correct module 2017-03-16 16:48:54 +01:00
Mike Rosseel
e0151df520 fix bugs and replace errors 2017-03-16 15:33:45 +01:00
Mike Rosseel
2efc3acb29 split network-messages in its own module. Compiles. 2017-03-16 14:38:18 +01:00
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
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