3142 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Manfred Karrer	f268abe2e1	Merge DAO branch to Development branch	2017-06-27 01:30:24 +02:00
Manfred Karrer	e2fa679a68	Merge DAO branch to Development branch	2017-06-27 01:29:54 +02:00
Manfred Karrer	29d1bd1d8b	Merge pull request #828 from SMH17/patch-1 ... Update Bitsquare.iss	2017-06-04 21:25:18 +02:00
Silvio Marano	3cc78f2ecf	Update Bitsquare.iss	2017-06-04 20:03:51 +02:00
Manfred Karrer	6ec49265fd	Fix space	2017-05-18 16:10:47 +02:00
Manfred Karrer	e49b6b8783	Version 0.4.9.9.2	2017-05-18 15:41:48 +02:00
Manfred Karrer	24b19e527b	Fix wrong trade fees	2017-05-18 15:41:04 +02:00
Manfred Karrer	e5585a1b3a	Version 0.4.9.9.2	2017-05-18 00:44:43 +02:00
Manfred Karrer	e107927fb2	Update PersistedP2PStorageData	2017-05-18 00:44:08 +02:00
Manfred Karrer	c5e23feccd	Increase default tx fee for non-trade txs to 150_000 sat	2017-05-18 00:29:06 +02:00
Manfred Karrer	b38e7806d9	Increase tx fee for trades to 150_000 sat	2017-05-18 00:27:53 +02:00
Manfred Karrer	ec6d67ca72	Add Janus	2017-05-18 00:16:58 +02:00
Manfred Karrer	b50714eb30	Add Janus	2017-05-18 00:16:30 +02:00
Manfred Karrer	41d9123397	Merge pull request #805 from tig100/nxt-validation ... Nxt address validator	2017-04-24 21:30:00 -05:00
Tomislav Gountchev	4c47c26013	Nxt address validator	2017-04-23 13:15:16 +03:00
Manfred Karrer	34ca2ecf28	Add OctoCoin	2017-03-30 21:18:19 -05:00
Manfred Karrer	17edfdb51f	Merge pull request #792 from my-first/master ... Finish adding Octocoin	2017-03-30 21:15:05 -05:00
Manfred Karrer	1d9113499d	Merge branch 'Development' into master	2017-03-30 21:14:57 -05:00
MyFirst	efb1689eb3	Fix missing P2SH prefix in validation regex	2017-03-30 16:09:31 -04:00
MyFirst	f9c4bb730c	Fix Typos in Octocoin validation	2017-03-30 15:29:33 -04:00
MyFirst	23c4768d29	Rename OctocoinAddressValidator to OctocoinAddressValidator.java	2017-03-30 15:01:59 -04:00
Manfred Karrer	4c8f20d237	Fixed some OctroCoin bugs. Tests still failing. Need fix	2017-03-30 09:24:30 -05:00
Manfred Karrer	928668004a	Merge pull request #790 from my-first/master ... Add Octocoin	2017-03-30 09:09:00 -05:00
MyFirst	8462867afe	Fix P2SH	2017-03-30 02:09:27 -04:00
MyFirst	38b66e7f9a	Add Octocoin	2017-03-30 01:25:55 -04:00
MyFirst	2e8bc02b5d	Add Octocoin	2017-03-30 01:09:04 -04:00
MyFirst	d2190efb66	Add Octocoin	2017-03-30 01:07:33 -04:00
MyFirst	cb4716e85f	Add Octcoin	2017-03-30 01:02:33 -04:00
Manfred Karrer	fd8f555c68	Use "open" as default filter in arbitration dispute table	2017-03-23 16:56:44 -05:00
Manfred Karrer	c8d05c23fa	Update conmment: Add onion address of arbitrators	2017-03-23 16:13:13 -05:00
Manfred Karrer	fd8e217b35	Cleanup	2017-03-23 10:36:26 -05: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
Manfred Karrer	30e91ea0ee	Dont use peers from AddressMessage calls in btcj if we have set our own node addresses or use localhost.	2017-03-17 00:44:01 -05:00
Manfred Karrer	01707ebb2d	Update bitcoinJ to 0.13.1.10	2017-03-17 00:12:42 -05:00
Manfred Karrer	ff5cdaacaa	Update bitcoinJ to 0.13.1.10	2017-03-17 00:09:53 -05:00