4705 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Manfred Karrer	f6c3395a85	Merge branch 'Development' into dao	2017-12-04 17:24:31 -05:00
Manfred Karrer	794473602e	Merge branch 'master' into Development	2017-12-04 17:24:11 -05:00
Manfred Karrer	ddd857a7f9	Add check for empty list	2017-12-04 17:23:57 -05:00
Manfred Karrer	4e4eae8bc4	Fix BSQ tx list UI	2017-12-04 13:52:57 -05:00
Manfred Karrer	721bc6bb9f	Update parser for com request. Show comp req in btc tx list.	2017-12-02 12:05:11 -05:00
Manfred Karrer	56886693e8	Add feature for removing comp request. Add phase calculation	2017-12-01 22:13:11 -05:00
Manfred Karrer	0bdf68c614	Merge branch 'Development' into dao	2017-12-01 17:15:58 -05:00
Manfred Karrer	ee4f37ddf7	Update btc nodes	2017-12-01 16:10:52 -05:00
Manfred Karrer	12e1124b6d	Merge branch 'Development' into dao ... # Conflicts: # gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java	2017-11-30 23:33:49 -05:00
Manfred Karrer	ea5548f2ec	Add coin selection options to withdrawal screen	2017-11-30 23:01:30 -05:00
Manfred Karrer	52d6d8adc6	Add option in withdrawal screen to include or exclude miner fee	2017-11-30 21:29:56 -05:00
Manfred Karrer	1d7c15f34a	Make validators not singleton. Remove address from fee estimation call	2017-11-30 19:43:49 -05:00
Manfred Karrer	6b84642015	Use FullAddress for filtered node check	2017-11-30 19:42:48 -05:00
Manfred Karrer	d7d5ffe9e1	Fix bugs with comp x	2017-11-30 11:22:59 -05:00
Manfred Karrer	fd386c564b	Make comp requests persistable	2017-11-30 10:00:05 -05:00
Manfred Karrer	07140889bf	Reset DevEnv flags.	2017-11-28 19:22:18 -05:00
Manfred Karrer	714565c990	Add check if list is not empty. Reset DevEnv flags.	2017-11-28 19:19:22 -05:00
Manfred Karrer	bf87dc3713	Adjust fees and sec. deposit	2017-11-28 18:53:19 -05:00
Manfred Karrer	fe92092f9c	Hide fee window if DAO trading is deactivated	2017-11-28 18:38:16 -05:00
Manfred Karrer	0e44efcfb9	Use fee selection popup for take offer	2017-11-28 18:12:43 -05:00
Manfred Karrer	f9028bed85	Merge branch 'Development' into dao	2017-11-28 13:04:13 -05:00
Manfred Karrer	a82001337e	Merge branch 'ripcurlx-Development' into Development	2017-11-28 13:01:27 -05:00
Manfred Karrer	9c3855ee2d	Add comment	2017-11-28 13:01:14 -05:00
Manfred Karrer	96cc6dbe3a	Add popup for fee currency selection	2017-11-28 12:52:30 -05:00
Manfred Karrer	06b0bdd28d	Refactiong: rename methods and params	2017-11-28 12:46:08 -05:00
Manfred Karrer	b882cb829a	Cleanup	2017-11-28 12:44:32 -05:00
Manfred Karrer	bb1576e691	Remove unused windows	2017-11-28 12:42:42 -05:00
Christoph Atteneder	52eb667b2d	Merge remote-tracking branch 'upstream/Development' into Development	2017-11-28 11:52:46 +01:00
Manfred Karrer	e071653651	Add new flag to DevEnv	2017-11-27 22:17:23 -05:00
Manfred Karrer	a269be7f16	Apply formatting	2017-11-27 12:40:23 -05:00
Manfred Karrer	0de1c6a6c2	Improve UI	2017-11-27 11:31:37 -05:00
Manfred Karrer	8572ea76d1	Fix missing handling for case when no other seed nodes are available	2017-11-27 11:30:34 -05:00
Manfred Karrer	6ac331a368	Use new regtest genesis tx	2017-11-27 11:29:23 -05:00
Manfred Karrer	2bd7b59b9a	Use currency name instead of code for compareTo	2017-11-27 11:28:34 -05:00
Manfred Karrer	0aaab849eb	Add second seed node for Dash and LTC	2017-11-27 08:03:24 -05:00
Manfred Karrer	02a5b1386d	Set abs. path for SetupIconFile for windows build	2017-11-27 08:02:02 -05:00
Manfred Karrer	2b248c5426	Separate fees in trade complete screen. Show withdrawal btc address only after button click	2017-11-26 20:06:11 -05:00
Manfred Karrer	2137522e1f	Update PersistableNetworkPayloadMap_BTC_MAINNET	2017-11-26 18:40:24 -05:00
Manfred Karrer	eeb503c13f	Merge branch 'Development'	2017-11-26 18:25:08 -05:00
Manfred Karrer	9fe58976ce	Release candidate 0.6.1	2017-11-26 17:13:05 -05:00
Manfred Karrer	6159ae7f9f	Remove failing btc node	2017-11-26 17:12:10 -05:00
Manfred Karrer	e3c9f150f5	Clean up	2017-11-26 16:35:47 -05:00
Manfred Karrer	7a1e377ec4	Fix SetupIconFile path. Comment out dead btc node	2017-11-26 16:18:56 -05:00
Manfred Karrer	cc0c540afc	Reduce nr. of btcj nodes from 12 to 10. Improve logging. Cleanup.	2017-11-26 13:48:53 -05:00
Manfred Karrer	838bf72a60	Use libdohj bba4088c. Improve logging. Cleanup	2017-11-26 11:40:53 -05:00
Manfred Karrer	0d8c600b6c	Add waring popups for aridrop coins	2017-11-25 09:57:43 -05:00
Manfred Karrer	cda5b0da9f	Merge branch 'mrosseel-forkcoins' into Development	2017-11-25 08:59:16 -05:00
Mike Rosseel	b8b84bc35f	Add Bitcoin Cash, Bitcoin Gold and Bitcoin Clashic so that these can ... be transacted in a privacy-preserving way	2017-11-25 10:07:25 +01:00
Manfred Karrer	07d85b3f8b	Set version 0.6.1. Add versions for seed and statistics nodes	2017-11-24 14:23:49 -05:00
Manfred Karrer	79bd1d5e6c	Add more tests, cleanup	2017-11-24 14:09:45 -05:00