2129 commits

Author	SHA1	Message	Date
Mike Rosseel	c79d9e992c	Reverting non-relevant changes	2017-10-12 16:12:21 +02:00
Mike Rosseel	0755cac9d1	Merge remote-tracking branch 'origin/Development' into api-pr1 ... Conflicts: common/src/main/java/io/bisq/common/locale/LocaleUtil.java	2017-10-11 14:38:34 +02:00
Manfred Karrer	01cf823d7a	Prepare merge Dev	2017-10-11 07:21:50 -05:00
Manfred Karrer	27ecbf7260	Publish accountAgeWitness data to P2P network (WIP)	2017-10-09 21:14:40 -05:00
Manfred Karrer	130c9bd5bc	Merge branch 'Development' into PaymentAccountAgeVerification	2017-10-09 09:39:52 -05:00
Mike Rosseel	fbfb9ccc50	Merge branch 'Development' into issue544-api	2017-10-09 16:11:37 +02:00
Manfred Karrer	6904c545b0	Improve logging	2017-10-08 19:53:04 -05:00
Manfred Karrer	ce25beff5e	Merge master to Development	2017-10-06 21:04:04 -05:00
Manfred Karrer	e5738507c3	Merge branch 'master' into Development	2017-10-06 20:57:32 -05:00
Manfred Karrer	b060766537	Set phase 0 initial genesis tx	2017-10-06 20:45:07 -05:00
Manfred Karrer	fe91c8ee76	Set phase 0 genesis tx	2017-10-06 14:28:50 -05:00
Manfred Karrer	175c1e4b96	Add AccountAgeWitnessMap to PB (WIP)	2017-10-06 13:58:35 -05:00
Manfred Karrer	52dd76bd9a	Remove inactive blockexplorer blockr.io	2017-10-06 12:43:59 -05:00
Manfred Karrer	6de0355a4f	Add AccountAgeWitness to PB	2017-09-25 13:07:10 -05:00
Manfred Karrer	efcc7ff05c	Remove accountSalt from trade messages and TradePeer	2017-09-25 12:47:09 -05:00
Manfred Karrer	952c0d00ad	Add accountSalt to tradingPeer	2017-09-25 12:27:56 -05:00
Manfred Karrer	5d960dd901	Change comments	2017-09-25 12:17:29 -05:00
Manfred Karrer	94e2c1bf66	Remove dev value for accountSalt	2017-09-25 11:16:00 -05:00
Manfred Karrer	6274b646ed	Move salt from PaymentAccount to PaymentAccountPayload	2017-09-25 11:10:49 -05:00
Manfred Karrer	091e766e21	Add RestrictedByContractJson interface	2017-09-25 09:41:29 -05:00
Manfred Karrer	d349acb09e	Fix comments	2017-09-25 09:31:07 -05:00
Manfred Karrer	b667e1b18a	Rename PaymentAccountAgeWitnessService to AccountAgeWitnessService	2017-09-25 09:16:01 -05:00
Manfred Karrer	fb5b8ecc0f	Rename PaymentAccountAgeWitness to AccountAgeWitness	2017-09-25 09:15:20 -05:00
Manfred Karrer	ea1666a665	Rename getPayload to createPayload in PaymentAccount	2017-09-25 09:14:29 -05:00
Manfred Karrer	8c7e1fd04a	Add verification methods, add hash to offer, add salt to trde process (WIP)	2017-09-25 09:13:23 -05:00
Manfred Karrer	4ef8309153	Add TakerVerifyOffersAgeWitnessHash to taker protocols	2017-09-25 09:12:02 -05:00
Manfred Karrer	c3320123c5	Add log for invalid arbitrators	2017-09-25 08:55:55 -05:00
Manfred Karrer	6d1a40dbd5	Merge branch 'Development' into PaymentAccountAgeVerification	2017-09-23 11:15:37 -05:00
Manfred Karrer	01e0ac3f57	Add equals check and diff for contractAsJson	2017-09-23 11:14:55 -05:00
Manfred Karrer	007142ed9b	Add AgeWittness domain (WIP)	2017-09-23 10:08:32 -05:00
Manfred Karrer	fcd3106eb4	Remove comment	2017-09-21 09:57:33 -05:00
Manfred Karrer	af27682f2f	Merge Development	2017-09-21 09:56:01 -05:00
Manfred Karrer	86c20682e9	Cleanup startup process	2017-09-21 09:03:50 -05:00
Manfred Karrer	96601afb9c	Fix issue #927	2017-09-20 15:52:16 -05:00
Manfred Karrer	80111caf3b	Rename bisq.io to bisq.network.	2017-09-20 15:21:13 -05:00
Manfred Karrer	a5ab750ce8	Fix bug with missing MultiSigKey	2017-09-20 11:45:24 -05:00
Mike Rosseel	9e04fe4b15	Add missing OfferUtil and fix docs ... Branch did not compile due to missing checkin of the OfferUtil file. Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>	2017-09-20 11:38:33 +02:00
Manfred Karrer	016626c745	Activate DAO for BTC testnet and regtest	2017-09-19 20:53:51 -05:00
Manfred Karrer	e5ac5488f7	Remove not traded altcoins	2017-09-19 18:47:55 -05:00
Manfred Karrer	4aeea11d63	Rearrange blockexplorers	2017-09-18 13:04:28 -05:00
Manfred Karrer	bc515475e0	Add OXT blockexplorer	2017-09-18 13:03:10 -05:00
Manfred Karrer	0bc339f916	Remove DOGE from base currency selection	2017-09-18 12:53:23 -05:00
Manfred Karrer	322ffab270	Cleanup	2017-09-18 12:21:48 -05:00
Manfred Karrer	36b266a204	Add altcoin DEC	2017-09-18 08:59:53 -05:00
Manfred Karrer	47972382ac	Add comments for support of hash of payment account	2017-09-18 08:34:42 -05:00
Mike Rosseel	a72986ff5b	Merge remote-tracking branch 'origin/Development' into issue544-api	2017-09-18 09:45:22 +02:00
Manfred Karrer	9544095f86	Remove never traded coins	2017-09-17 13:12:12 -05:00
Manfred Karrer	7c45fb78cc	Remove never traded coins	2017-09-17 13:10:34 -05:00
Manfred Karrer	b72d716910	Merge Development	2017-09-17 11:28:34 -05:00
Manfred Karrer	50106990ba	Merge branch 'master' into Development ... Merge master to Development	2017-09-16 12:28:49 -05:00