mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity
4776 commits 3 branches 150 tags 4.1 GiB
Commit graph

4776 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
ad8c23b294
Merge branch 'add-xspec' of https://github.com/jbg/exchange into jbg-add-xspec 2017-12-19 21:20:40 +01:00
Manfred Karrer
8637bc4cc8
Merge branch 'master' into Development 2017-12-19 20:59:42 +01:00
Manfred Karrer
2f1015475d
Update IP of btc node. Remove unused classes 2017-12-19 20:59:26 +01:00
Manfred Karrer
013a960d01
Merge master 2017-12-19 20:55:03 +01:00
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
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
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
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
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
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