373 commits

Author	SHA1	Message	Date
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
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	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	af27682f2f	Merge Development	2017-09-21 09:56:01 -05:00
Ellaismer	a61f37b6e1	Add Ellaism coin	2017-09-21 04:38:36 +08: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	1b324631ae	Rename \'Account holder name\' to \'Account owner full name\'	2017-09-19 20:54:36 -05: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	76e031bbb2	Merge Development	2017-09-18 11:48:25 -05:00
Manfred Karrer	23828c3e79	Remove some altcoins, add comment	2017-09-18 11:46:04 -05:00
Manfred Karrer	36b266a204	Add altcoin DEC	2017-09-18 08:59:53 -05:00
Manfred Karrer	2357e6c399	Add missing altcoins (WAC, PNC, ZEN)	2017-09-18 08:56:34 -05:00
Manfred Karrer	97396cbd2d	Add altcoin DEC	2017-09-18 08:38:06 -05:00
Manfred Karrer	47972382ac	Add comments for support of hash of payment account	2017-09-18 08:34:42 -05: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
Manfred Karrer	a9b1a9bd5b	Remove single opening quote in dispute message	2017-09-16 10:31:52 -05:00
Manfred Karrer	13a95317bc	Fix broken link to Arbitration system	2017-09-16 10:25:10 -05:00
Chris Beams	0f2145d19c	Rename bisq-network/{bisq-exchange => exchange} ... This is a follow on to 6ffa52a00. bisq-network/bisq-exchange is too verbose, and other repositories have been shortened as well, e.g. bisq-network/price-relay-node has become bisq-network/pricenode.	2017-09-05 14:55:42 +02:00
Manfred Karrer	902e3de80a	Rename ShadowCash to Particl (https://github.com/bisq-network/bisq-exchange/issues/911)	2017-08-27 12:42:01 +02:00
stevenkain	2fb74f4936	Update displayStrings.properties	2017-08-25 23:35:15 +03:00
stevenkain	aa87319fca	Update displayStrings.properties	2017-08-25 23:34:30 +03:00
stevenkain	50310338b4	Update displayStrings.properties	2017-08-25 23:05:06 +03:00
Chris Beams	6ffa52a006	Rename bitsquare/bitsquare => bisq-network/bisq-exchange	2017-08-23 15:36:17 +02:00
stevenkain	a3b1a5ff6a	Update displayStrings.properties ... Senders name -> Sender's name	2017-08-10 16:54:45 +03:00
stevenkain	fd683db2d4	Update displayStrings.properties	2017-08-09 19:14:42 +03:00
Manfred Karrer	a7c0f1d16f	Merge branch 'Development' into DAO_phase1	2017-08-09 12:48:56 +02:00
Manfred Karrer	e8c46c9709	Merge branch 'master' into Development ... # Conflicts: # doc/build.md	2017-08-09 12:48:07 +02:00
stevenkain	c92f955060	Update displayStrings.properties	2017-08-04 21:57:03 +03:00
Manfred Karrer	94203b9101	Add BSQ dashboard/statistics	2017-07-29 03:09:39 +02:00
Manfred Karrer	2a67d39d53	Cleanup	2017-07-29 00:04:31 +02:00
Manfred Karrer	5b5c0e66c7	Improve wording	2017-07-28 20:04:38 +02:00
Manfred Karrer	2f322f7a33	Merge branch 'Development' into DAO_phase1	2017-07-27 17:12:24 +02:00
Manfred Karrer	2d6fa2be6f	Move removeCryptographyRestrictions method to Utilities and add static initializer to SeedNodeMain, ProviderMain and StatisticsMain	2017-07-27 17:12:14 +02:00