4971 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ibrahim MOKDAD	a492fb7cec	Update CRED test	2017-12-17 09:23:35 +03:00
Ibrahim MOKDAD	2905a2edae	Update Added CRED	2017-12-17 09:13:08 +03:00
Ibrahim MOKDAD	158a6badc7	Added CryptoCurrency CRED	2017-12-17 09:03:58 +03:00
Manfred Karrer	24acf8f676	Merge branch 'SeedNode'	2017-12-16 16:12:18 +01:00
Manfred Karrer	67fbaa2ecb	Change log level for socket timeout exceptions and capabilities to debug	2017-12-16 16:06:30 +01:00
Manfred Karrer	0b612a0a9d	Update version nr for seed and provider nodes	2017-12-16 00:14:21 +01:00
Manfred Karrer	c6cfdb2b58	Increase socket timoput to 2 minutes. Revert to old netlayer library version. Add user agent.	2017-12-16 00:12:25 +01:00
Christoph Atteneder	47f6965090	Extract inline styles	2017-12-15 11:38:49 +01:00
Christoph Atteneder	b003322a49	Extract separator inline styles	2017-12-15 11:15:29 +01:00
Christoph Atteneder	89009fe859	Add missing highlight hover style	2017-12-15 11:12:04 +01:00
Christoph Atteneder	4b6298582a	Add general styles for consolidation	2017-12-15 11:08:50 +01:00
Christoph Atteneder	519976c09b	Extract table title inline style	2017-12-15 10:28:32 +01:00
Christoph Atteneder	7cb688ca08	Extract inline styles of MainView	2017-12-14 19:11:06 +01:00
Christoph Atteneder	e18fd5b140	Extract inline styles from take offer view	2017-12-14 17:33:32 +01:00
Christoph Atteneder	bb3572d112	Extract inline styles from create offer view	2017-12-14 17:28:54 +01:00
Christoph Atteneder	5de928e65d	Extract DAO inline style	2017-12-14 17:10:45 +01:00
Christoph Atteneder	73c1f78325	Extract arbitration inline styles	2017-12-14 17:03:15 +01:00
Christoph Atteneder	59fd85e43b	Remove unused colors and add usage counter	2017-12-14 16:42:28 +01:00
Christoph Atteneder	6621368223	Remove unused style	2017-12-14 13:55:29 +01:00
Christoph Atteneder	c4f3f5cdfc	Extract general icon behavior ("hand cursor") and remove styles that have no effect.	2017-12-14 13:53:21 +01:00
Christoph Atteneder	867c310cd5	Extract inline style for GridPanes	2017-12-14 13:05:03 +01:00
Christoph Atteneder	d85cebd1ee	Move qr code image style into stylesheet	2017-12-14 12:15:28 +01:00
Christoph Atteneder	5658cee60f	Extract missing font colors	2017-12-14 11:52:59 +01:00
Christoph Atteneder	07e6bea5b0	Add color derive examples	2017-12-14 11:39:13 +01:00
Christoph Atteneder	1482d41520	Sort color codes	2017-12-14 11:18:12 +01:00
Christoph Atteneder	235190a346	Extract color codes to top of style file	2017-12-14 10:31:12 +01:00
Christoph Atteneder	d8bf73c650	Merge remote-tracking branch 'upstream/Development' into feature/clean-up-css	2017-12-14 10:28:25 +01:00
Manfred Karrer	037be6d4f8	Merge branch 'mrosseel-priceNodeGetParams' into Development	2017-12-14 01:06:04 +01:00
Manfred Karrer	5ada81c54e	Merge branch 'priceNodeGetParams' of https://github.com/mrosseel/bisq-exchange into mrosseel-priceNodeGetParams	2017-12-14 00:59:36 +01:00
Manfred Karrer	071b39eea2	Merge branch 'mrosseel-priceNodeEnrichJson' into Development	2017-12-14 00:58:38 +01:00
Manfred Karrer	e257342c69	Refactor: Move constants to PriceRequestService	2017-12-14 00:58:27 +01:00
Mike Rosseel	ee1c45dea7	Add extra fields to /getAllMarketPrices json output (counts, origin)	2017-12-12 21:35:25 +01:00
Mike Rosseel	4f7ad89a4c	Add /getParams pricenode endpoint so pricenode params can be monitored	2017-12-11 15:33:38 +01:00
Jasper Bryant-Greene	539c767476	Added XSPEC altcoin	2017-12-11 14:21:32 +01:00
Christoph Atteneder	fa0a88fa8d	Merge remote-tracking branch 'upstream/Development' into Development	2017-12-11 10:13:56 +01:00
Manfred Karrer	a25b1f81be	Adjust comment	2017-12-09 10:25:35 -05:00
Manfred Karrer	7748fe66a9	Merge branch 'dulanov-fix-588' into Development	2017-12-09 10:24:31 -05:00
Manfred Karrer	de957e833f	Merge branch 'fix-588' of https://github.com/dulanov/exchange into dulanov-fix-588	2017-12-09 10:22:07 -05:00
Dmitry Ulanov (aka dulanov)	8ba7b351e7	After price feed actualization re-ordering doesn't perform ... Fixes #588.	2017-12-09 12:55:23 +01:00
Manfred Karrer	5bcbdc74b2	Use domainname instead of IP if both are known for btc nodes	2017-12-08 19:37:30 -05:00
Manfred Karrer	a2e67e9965	Change IP of Jochen's btc node	2017-12-08 19:31:20 -05:00
Manfred Karrer	22eb845e00	Merge branch 'master' into Development	2017-12-08 11:16:04 -05:00
Manfred Karrer	76e1cd2eca	Add comment with old price relay nodes	2017-12-08 11:15:40 -05:00
Manfred Karrer	659d37f20d	Add fee estimation params as prog args	2017-12-08 10:21:06 -05:00
Manfred Karrer	a784cf90fa	Add more log info	2017-12-08 01:05:15 -05:00
Manfred Karrer	a6e94af3b2	Fix wrong handler for DAO startup. Change log level.	2017-12-08 00:02:21 -05:00
Manfred Karrer	558157082d	Add filter for btc nodes	2017-12-07 23:14:34 -05:00
Manfred Karrer	147ed07370	Adjust fee	2017-12-07 22:30:38 -05:00
Manfred Karrer	e3408ea9d1	Merge branch 'BetterUpdateWindow' into Development	2017-12-07 22:27:32 -05:00
Manfred Karrer	a43ab663db	Merge branch 'master' into Development ... # Conflicts: # core/src/main/java/io/bisq/core/provider/fee/FeeService.java # gui/src/main/java/io/bisq/gui/main/dao/DaoView.java	2017-12-07 22:27:26 -05:00