3508 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Manfred Karrer	130c9bd5bc	Merge branch 'Development' into PaymentAccountAgeVerification	2017-10-09 09:39:52 -05:00
Manfred Karrer	a76b4d17f5	Show better text in PeerInfo if 0 trades	2017-10-08 21:03:08 -05:00
Manfred Karrer	361a520048	Remove sum column in market offerbook tables	2017-10-08 20:48:11 -05:00
Manfred Karrer	4522f50149	Fix wrong fee group at Create offer screen. Improve wording	2017-10-08 20:39:09 -05:00
Manfred Karrer	3963924359	Change Maker fee to Trade fee	2017-10-08 20:03:20 -05:00
Manfred Karrer	e26037c59f	Change Taker fee to Trade fee	2017-10-08 20:00:37 -05:00
Manfred Karrer	cb24b973ba	Don't show fee and security deposit fields if BSQ is not enabled	2017-10-08 19:53:52 -05:00
Manfred Karrer	6904c545b0	Improve logging	2017-10-08 19:53:04 -05:00
Manfred Karrer	15a5f75877	Merge remote-tracking branch 'upstream/Development' into Development	2017-10-06 21:04:53 -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	2ac1b34996	Disable dev mode	2017-10-06 20:45:27 -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	99dc2f710a	Merge branch 'riclas-patch-6'	2017-09-30 13:16:35 -05:00
riclas	ae4212c567	created properties file for Simplified Chinese from transifex	2017-09-30 19:05:16 +01:00
Manfred Karrer	e6498e2659	Remove pre-filled entries in ManualPayoutTxWindow	2017-09-26 09:06:12 -05:00
Manfred Karrer	da2b12f71a	Rename SpendFromDepositTxWindow to ManualPayoutTxWindow	2017-09-26 08:47:55 -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	68badcbcc8	Change name of IOP to Internet Of People	2017-09-25 12:13:38 -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	791c16a2e6	Add module consensus	2017-09-25 09:41:10 -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	e73cd7abe2	Fix typos	2017-09-22 08:33:38 -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	570e2ffba0	Increase timeout	2017-09-21 09:02:59 -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	ac0bf80606	Support different keys for code signing in download-tool	2017-09-20 15:05:25 -05:00
Manfred Karrer	981e6814cc	Add Chris Beams' gpg key 5BC5ED73 to resources	2017-09-20 13:07:50 -05:00
Manfred Karrer	a5ab750ce8	Fix bug with missing MultiSigKey	2017-09-20 11:45:24 -05:00
Manfred Karrer	1b324631ae	Rename \'Account holder name\' to \'Account owner full name\'	2017-09-19 20:54:36 -05:00