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

3709 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
0a46581407 Add pubKeyHex 2017-03-22 13:03:21 -05:00
Manfred Karrer
b2a85d65f3 Merge branch 'master' into Development 
# Conflicts:
#	pom.xml
 2017-03-22 12:14:42 -05:00
Manfred Karrer
d3da53d140 Cleanup 2017-03-22 12:14:17 -05:00
Manfred Karrer
6348c9c70a Cleanup 2017-03-22 11:55:15 -05:00
Manfred Karrer
1f0df0c132 Fix unintended string 2017-03-22 11:50:25 -05:00
Manfred Karrer
92ea099ab8 Update to BitcoinJ 0.13.1.11 2017-03-22 11:48:55 -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
Mike Rosseel
5ea37964bb doc update 2017-03-22 08:19:01 +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
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
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
fbf6668ced Merge pull request #782 from riclas/patch-1 
fix typo and delete hidden character
 2017-03-20 18:10:12 -05:00
riclas
ee81e059de fix typo and delete hidden character 2017-03-20 22:16:34 +00:00
Manfred Karrer
63bf1942e4 Add extraDataMap field to all StoragePayload objects 2017-03-20 16:27:54 -05:00
Manfred Karrer
6ae9601ddf Cleanup protobuffer numbers 2017-03-20 14:38:51 -05:00
Manfred Karrer
6350875882 Rename PB_Offer to OfferPayload in protobuffer definition 2017-03-20 14:07:44 -05:00
Manfred Karrer
57df95df5c Add AltcoinValidator 2017-03-20 13:58:00 -05:00
Manfred Karrer
a41d13a093 Remove unused fields 2017-03-20 08:59:48 -05:00
Mike Rosseel
dae0112494 Merge branch 'DAO' into disk-protobuffer 
Conflicts:
	network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
 2017-03-20 08:55:22 +01:00
Manfred Karrer
1325def899 Change layout of market price icons and label text for market price. 2017-03-20 01:14:50 -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
943757179c Increase Alert.TTL to 30 days 2017-03-18 17:19:09 -05:00
Manfred Karrer
eb6360dffa Add null checks 2017-03-18 17:17:54 -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
Manfred Karrer
da4d4eeced Merge pull request #779 from bitsquare/delegate-test 
delegate test
 2017-03-17 11:29:25 -05:00
Mike Rosseel
e92fd88d52 delegate test 2017-03-17 16:52:27 +01:00
Mike Rosseel
0db56e8dbe start of disk serialisation 2017-03-17 16:44:47 +01:00
Manfred Karrer
4acf9516a4 Use btcj v.0.13.1.10 2017-03-17 10:38:39 -05:00
Manfred Karrer
2304bbc524 Merge pull request #778 from bitsquare/unit-test-fix 
fix unit tests
 2017-03-17 10:30:56 -05:00
Mike Rosseel
0696cb5c47 fix unit tests 2017-03-17 11:52:51 +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
01707ebb2d Update bitcoinJ to 0.13.1.10 2017-03-17 00:12:42 -05:00
Manfred Karrer
ff5cdaacaa Update bitcoinJ to 0.13.1.10 2017-03-17 00:09:53 -05:00
Manfred Karrer
60c1394b22 Fix invalid image URL 2017-03-16 22:12:44 -05:00
Manfred Karrer
af48575b7f Apply code inspection 2017-03-16 22:01:25 -05:00