4854 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Manfred Karrer	e3488184a5	Merge branch 'master' into Development ... # Conflicts: # provider/src/main/java/io/bisq/provider/price/providers/PoloniexProvider.java	2017-12-19 20:52:27 +01:00
Manfred Karrer	40b23b28d6	Merge non critical changes from dev branch	2017-12-19 20:52:00 +01:00
Manfred Karrer	c80d891d6f	Refactoring: Rename calss	2017-12-19 20:13:47 +01:00
Manfred Karrer	e5eff0d648	Remove unneeded broadcast trade fee tasks	2017-12-19 20:12:29 +01:00
Manfred Karrer	8f48e080cb	Merge branch 'master' into Development ... # Conflicts: # core/src/main/java/io/bisq/core/btc/BitcoinNodes.java # core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java # core/src/main/java/io/bisq/core/filter/FilterManager.java	2017-12-19 19:55:00 +01:00
Manfred Karrer	fb8763436a	Fix pom	2017-12-19 19:22:40 +01:00
Manfred Karrer	a13a59fc4b	Refactoring: Rename seednode_monitor to monitor	2017-12-19 19:19:13 +01:00
Manfred Karrer	2710da63a6	Add support for checking btc nodes. Add new option keys: useAllProvidedNodes, numConnectionForBtc. Change DEFAULT_CONNECTIONS back from 8 to 10. Refactorings.	2017-12-19 19:15:29 +01:00
Chris Beams	b95946ec54	Merge pull request #1102 from arashohadi/master ... Fix typo 'needs' to 'need'	2017-12-19 12:36:58 +01:00
Arash Ohadi	2879083c8b	Fix typo 'needs' to 'need'	2017-12-19 12:24:14 +01:00
Manfred Karrer	13883fe4ec	Improve monitor	2017-12-19 00:18:18 +01:00
Manfred Karrer	852d4c5ba5	Add and change btc, seed and provider nodes. Use only HS nodes if tor is used for btcj	2017-12-18 23:37:32 +01:00
Manfred Karrer	a5e3072772	Set CET for date display of monitor. Fix numErrors display	2017-12-18 16:03:57 +01:00
Manfred Karrer	f9f510ef1b	Remove outdated filter entries from properties file	2017-12-18 15:55:48 +01:00
Manfred Karrer	f4e22253e4	Add userAgent	2017-12-18 15:55:17 +01:00
Manfred Karrer	ed0845c62b	Fix seed node monitoring error handling. Prefer hostname over IP if both are provided in btc nodes.	2017-12-18 13:30:56 +01:00
swordfish5975	eeceef2bb1	Cagecoin	2017-12-18 21:11:16 +10:00
swordfish5975	86370ea1cc	CageCoin	2017-12-18 21:01:29 +10:00
Christoph Atteneder	4cbf518930	Show tor connection progress during app startup	2017-12-18 11:28:14 +01:00
Manfred Karrer	04e7742c60	Increase offer refresh and republish intervals and TTL.	2017-12-18 00:15:45 +01:00
Manfred Karrer	4e0ddd8fe7	Decrease maxConnections for btc network from 10 to 8	2017-12-18 00:14:51 +01:00
Manfred Karrer	045bfd21b3	Clean up btc nodes	2017-12-18 00:14:18 +01:00
Manfred Karrer	7d14975241	Increase timeouts. Rename TIME_OUT to TIMEOUT.	2017-12-17 22:35:09 +01:00
Manfred Karrer	13cd2a4496	Merge branch 'feature/clean-up-css' of https://github.com/ripcurlx/exchange into ripcurlx-feature/clean-up-css	2017-12-17 22:24:35 +01:00
Manfred Karrer	83cd1b7ebc	Merge branch 'master' into Development ... # Conflicts: # core/src/main/java/io/bisq/core/app/BisqEnvironment.java	2017-12-17 22:11:12 +01:00
Manfred Karrer	2ca59a819d	Add num requests to monitor	2017-12-17 21:56:07 +01:00
Manfred Karrer	ef8796be3c	Update seednode version to 0.6.2	2017-12-17 21:21:19 +01:00
Manfred Karrer	f12c89db78	Fix name of monitor jar file	2017-12-17 21:03:04 +01:00
Manfred Karrer	1055232cb4	Add color codes for monitor	2017-12-17 20:49:39 +01:00
Manfred Karrer	f87840a7d4	Merge branch 'SeedNode'	2017-12-17 20:39:21 +01:00
Manfred Karrer	d77eb89e78	Add seed node monitor module	2017-12-17 20:39:00 +01:00
Manfred Karrer	c947dab7eb	Increase socket timeout from 10 sec to 2 min.	2017-12-17 20:38:39 +01:00
Ibrahim MOKDAD	c6c6892e27	Updated, added true for running on eth blockchain	2017-12-17 09:34:30 +03:00
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