384 commits

Author	SHA1	Message	Date
Manfred Karrer	e56fc44956	Only use accumulated hash in Witness object	2017-10-21 14:07:48 -05:00
Manfred Karrer	085f6b354b	Merge branch 'Development' into PaymentAccountAgeVerification	2017-10-20 18:54:23 -05:00
Manfred Karrer	2259cf7558	Merge branch 'master' into Development	2017-10-20 18:52:08 -05:00
Manfred Karrer	f9635cd7e1	Fix old github repo address	2017-10-20 18:50:31 -05:00
Manfred Karrer	515311dc98	Move Cryptonite to right position in list	2017-10-20 09:18:21 -05:00
Manfred Karrer	b750727a95	Derive nonce from peers data input	2017-10-17 22:20:36 -05:00
Manfred Karrer	a5533b9ffb	Add check to only add AccountAgeWitness if it is not older than 1 day.	2017-10-17 21:10:52 -05:00
Manfred Karrer	1206878579	Add peers account age witness verifications in trade process	2017-10-17 20:41:33 -05:00
vroehrig	c190f0c3b7	Update CurrencyUtil.java ... sorted entries alphabetically as per requirement	2017-10-17 21:19:22 +13:00
Manfred Karrer	5f9d59143e	Add salt field to payment method forms	2017-10-16 18:44:42 -05:00
Manfred Karrer	b60579fc37	Add account age to payment method forms	2017-10-16 18:16:24 -05:00
Manfred Karrer	654270ec94	Add maxTradeLimit to BtcValidator	2017-10-16 17:00:16 -05:00
Manfred Karrer	851792d1f1	Add new P2P network data structure for AccountAgeWitness without pubKey	2017-10-16 15:52:54 -05:00
Manfred Karrer	fe38f3a423	Rename Hash.getHash to Hash.getSha256Hash	2017-10-15 11:00:00 -05:00
Manfred Karrer	bd74d03ac1	Use Ripemd with sha256 hash to reduce size of witness hash to 20 bytes	2017-10-15 10:58:49 -05:00
Manfred Karrer	a3ab418079	Filter offer by account age withness age (WIP)	2017-10-14 12:54:03 -05:00
Manfred Karrer	b1a45f5365	Show account age and categroy in PeerIcon	2017-10-13 20:32:23 -05:00
vroehrig	a6acdc87f7	Update CurrencyUtil.java	2017-10-14 13:28:32 +13:00
Manfred Karrer	7c122369be	Show account age in peer info icon	2017-10-13 11:41:26 -05:00
Manfred Karrer	5adda7b64f	Merge branch 'Development' into PaymentAccountAgeVerification	2017-10-13 10:30:53 -05:00
Manfred Karrer	b2579fbfdd	Add new languages: Chinese, Hungarian, Romanian, Russian, French, Turkish	2017-10-12 21:33:00 -05:00
Manfred Karrer	5e8c8310ba	Merge branch 'Development' into PaymentAccountAgeVerification	2017-10-12 19:44:30 -05:00
Manfred Karrer	b0f451a2df	Merge remote-tracking branch 'upstream/Development' into Development	2017-10-12 19:11:26 -05:00
Manfred Karrer	9543b01d81	Merge branch 'master' into Development	2017-10-12 14:11:10 -05:00
Manfred Karrer	ad049caccb	Change name of IOP from Fermet to Internet Of People	2017-10-11 15:19:11 -05:00
Manfred Karrer	5d0c2d65c3	Change restrictiron for pw lenght from 50 to 500 chars	2017-10-11 15:17:01 -05:00
Manfred Karrer	5fb49b45bc	Change text for lost trade fee	2017-10-11 14:59:58 -05:00
Manfred Karrer	0c86ae9354	Add Altcoin Ellaism	2017-10-11 07:28:58 -05:00
Manfred Karrer	01cf823d7a	Prepare merge Dev	2017-10-11 07:21:50 -05:00
Manfred Karrer	e179475bb9	Merge branch 'Development' of https://github.com/ManfredKarrer/exchange	2017-10-11 07:14:01 -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
Manfred Karrer	ca71f4464f	Put altcoin Ellaism to right position in list	2017-10-08 21:15:38 -05:00
Manfred Karrer	a8c81871c9	Merge branch 'Development' of https://github.com/ellaismer/exchange into ellaismer-Development	2017-10-08 21:12:02 -05:00
Manfred Karrer	a76b4d17f5	Show better text in PeerInfo if 0 trades	2017-10-08 21:03:08 -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
Pepper Lebeck-Jobe	ec393aea5f	Change "until" to "by" in three places ... This common grammatical error for German-speakers can sound particularly strange to native English speakers. The rule is subtle, but these two sentences mean the same thing: 1. You have until 12am to place your drink order. 2. You must place your drink order by 12am.	2017-10-08 17:35:40 +02: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	175c1e4b96	Add AccountAgeWitnessMap to PB (WIP)	2017-10-06 13:58:35 -05:00
riclas	ae4212c567	created properties file for Simplified Chinese from transifex	2017-09-30 19:05:16 +01: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	68badcbcc8	Change name of IOP to Internet Of People	2017-09-25 12:13:38 -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