3590 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Manfred Karrer	94a44b6c99	Add emailAddress to arbitr. and mediator. Add PGPPubKey to PubKeyRing	2017-03-26 15:21:39 -05:00
Manfred Karrer	d551c056c1	Refactor trade state and phase. support correct handling for payment limits in offer	2017-03-26 12:40:16 -05:00
Manfred Karrer	a26c5b5d7a	Refactor trade state and phase. new trade process works so far (WIP)	2017-03-25 23:36:51 -05:00
Manfred Karrer	689fb86f80	Fix invalid trailing whitespace and quote	2017-03-25 18:29:40 -05:00
Manfred Karrer	4103920a31	Remove taks for laod trade fee tx (use verify task for it) (WIP)	2017-03-25 12:06:50 -05:00
Manfred Karrer	c860845c9a	Refactoring: Further renaming... (WIP)	2017-03-25 12:00:50 -05:00
Manfred Karrer	598291540e	Refactoring: Rename all usages of "offerer" with "maker" (excluding translation strings). Separate maker, taker, buyer, seller, buyerAsTaker, BuyerAsMaker, sellerAsMaker and sellerAsTaker in protocol	2017-03-25 11:50:08 -05:00
Manfred Karrer	1bfead7a77	Refactorings, add verifyFee tasks (WIP)	2017-03-25 11:05:26 -05:00
Manfred Karrer	0c08986ccc	Fix typo	2017-03-25 10:27:15 -05:00
Manfred Karrer	664b19f8c4	Dont use mailboxMessage for PayDepositRequest. Add setUID for all mailboxMessages. BuyerAsOfferer protocol complete. (WIP)	2017-03-24 22:23:26 -05:00
Manfred Karrer	af258497f5	Apply @Slf4j	2017-03-24 19:52:55 -05:00
Manfred Karrer	d158b008fb	BuyerAsOfferer protocol working with timelock removed (WIP)	2017-03-24 19:42:41 -05:00
Manfred Karrer	b6b7c44004	Remove timeLock properties (WIP)	2017-03-24 15:00:37 -05:00
Manfred Karrer	8e6c9cb3c5	Use underscpre instead of camelCase in proto buffer definition. Add Mediator. Remvoe TTL in proto buffer definitions. Remove Coin in proto buffer definitions	2017-03-24 14:33:32 -05:00
Mike Rosseel	284f405844	fix inject error	2017-03-24 13:29:09 +01:00
Manfred Karrer	510dc95ae4	Merge changes from master	2017-03-23 12:58:04 -05:00
Manfred Karrer	2520542ca6	Merge changes from master	2017-03-23 12:53:35 -05:00
Manfred Karrer	7944e06f54	Use @Value	2017-03-23 10:47:51 -05:00
Manfred Karrer	fd8e217b35	Cleanup	2017-03-23 10:36:26 -05:00
Mike Rosseel	ba98228fb8	DisputeList refactoring, PaymentAccount handling (removed all subclasses is proto)	2017-03-23 13:32:58 +01:00
Mike Rosseel	53f9860bfc	fix protobuffer compilation	2017-03-23 08:29:31 +01:00
Manfred Karrer	57f201fa55	Reduce nr. of backups for PersistedP2PStorageData and TradeStatisitics	2017-03-22 21:31:56 -05:00
Manfred Karrer	f84a038889	Version 0.4.9.9.1	2017-03-22 16:24:52 -05:00
Manfred Karrer	0a546978b3	Remove monitor and headless modules	2017-03-22 16:01:47 -05:00
Manfred Karrer	9d5ea06def	Add ClearXchange warning popups	2017-03-22 15:55:39 -05:00
Manfred Karrer	919de1af30	Update display strings regarding recomm. miner fee	2017-03-22 13:39:07 -05:00
Manfred Karrer	adbb547eb1	Rename offererMultiSigPubKey to offererBtcPubKey (as well as wellers side) to not break serialized data	2017-03-22 13:31:45 -05:00
Manfred Karrer	6733c064b9	Support filter for "open"	2017-03-22 13:31:06 -05:00
Manfred Karrer	6283255b21	Update PersistedP2PStorageData	2017-03-22 13:19:07 -05:00
Manfred Karrer	c0d92fae25	Add try/catch and error msg with info if error at spread calculation (overflow) occurs (again)	2017-03-22 13:16:30 -05:00
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	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