Commit graph

5019 commits

Author SHA1 Message Date
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
4a30d5874e
Fix missing callbacks for balance and com request updates 2017-12-08 17:16:26 -05:00
Manfred Karrer
430a304906
Fix threading issue 2017-12-08 15:21:41 -05:00
Manfred Karrer
0e16522307
Merge branch 'Development' into dao
# Conflicts:
#	core/src/main/java/io/bisq/core/dao/blockchain/BsqNode.java
2017-12-08 11:17:47 -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
b4d01ade87
Merge branch 'Development' into dao 2017-12-07 22:31:38 -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
Manfred Karrer
35b2b46d36
Add update later button. Make version lable clickable and show updates 2017-12-07 22:24:24 -05:00
Manfred Karrer
5117fa93f0
Improve maxMemory check and restart process 2017-12-07 22:22:15 -05:00
Manfred Karrer
ba90e20e43
Change log level for socket timeouts 2017-12-07 22:09:41 -05:00
Manfred Karrer
a03e093d69
Update node operator 2017-12-07 22:08:54 -05:00
Manfred Karrer
41a48952b6
Update to latest netlayer version. Increase delay for tor settings 2017-12-07 15:41:41 -05:00
Manfred Karrer
6b8276ba10
Set version 0.6.1 for provider node. Increase timout for offer availibility. 2017-12-07 14:48:49 -05:00
Manfred Karrer
b70bcd25b4
Deactive tabs of not impl. DAO features 2017-12-07 13:38:24 -05:00
Manfred Karrer
fa517511bb
Change price tolerance to 2% 2017-12-07 13:14:18 -05:00
Manfred Karrer
fdba0560af
Add comments 2017-12-07 13:07:23 -05:00
Manfred Karrer
b348255be9
Adjust fee estimation to avoid risk for unconfirmed txs. Reduce maxBlocks from 20 to 15 and change timespan for average from 1 hour to 30 min. 2017-12-07 13:00:56 -05:00
Manfred Karrer
41cf028f7e
Merge branch 'r8d8-fix/close_handler' into Development 2017-12-07 12:56:12 -05:00
Manfred Karrer
a944aba33d
Merge branch 'fix/close_handler' of https://github.com/r8d8/exchange into r8d8-fix/close_handler 2017-12-07 12:53:43 -05:00
Manfred Karrer
046cf513ec
Merge branch 'Development' into dao 2017-12-07 12:33:14 -05:00
Manfred Karrer
bec01232a0
Merge branch 'master' into Development 2017-12-07 12:32:41 -05:00
Manfred Karrer
43fc8eb365
Merge pull request #1072 from dulanov/market-ordering
Absent of market column custom comparator in `OfferBookView`
2017-12-07 12:31:33 -05:00
Manfred Karrer
06f2a02119
Change to new Regtest genesis tx id 2017-12-07 12:19:03 -05:00
Dmitry Ulanov (aka dulanov)
7b25a1b904
Absent of market column custom comparator in OfferBookView
Related to #588.
2017-12-07 17:38:24 +01:00
Manfred Karrer
feb71581ce
Merge pull request #1069 from ripcurlx/patch-2
Fix markdown formatting
2017-12-07 11:12:42 -05:00
Manfred Karrer
f445f9fa7d
Merge pull request #1068 from ripcurlx/patch-1
Update wrong package path
2017-12-07 11:12:16 -05:00
r8d8
945ef24772
Fix for handling fo modal window closing
Related to #1042
2017-12-07 17:53:19 +02:00
Christoph Atteneder
332dc60e92
Change class name to use hyphen(-) instead of underscore(_) 2017-12-07 12:53:20 +01:00
Christoph Atteneder
dcf91619d4
Fix markdown formatting 2017-12-07 11:58:41 +01:00