Manfred Karrer
cb8f1da9c9
Remove filtering dnsseed.bluematt.me
2017-11-04 14:34:08 -05:00
Manfred Karrer
fc13e338ab
Merge pull request #994 from cbeams/reformat
...
Reformat Java sources with Editorconfig settings
2017-11-04 14:31:42 -05:00
Chris Beams
e1a6f87a98
Reformat Java sources with Editorconfig settings
...
This change is the result of a global reformatting in IDEA now that
`.editorconfig` settings are in place. Note that Editorconfig's
`continuation_indent_size` property [1] was also added and set to 8
here, as this reflects the dominant style already present in the
codebase. i.e. in created a much smaller diff to set the continuation
indent to 8 that would have been created leaving this property out and
letting it default to 4.
[1]: https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties
2017-11-04 20:11:30 +01:00
Manfred Karrer
753b5afe91
Use RegTestHost.NONE as default
2017-11-04 11:10:05 -05:00
Manfred Karrer
04bc3d7ef4
Merge branch 'Development' into netlayer
2017-11-04 10:55:56 -05:00
Manfred Karrer
2896f42a9a
Use latest libdohj/BitcoinJ version
2017-11-04 10:55:33 -05:00
Manfred Karrer
c5a41ba4d7
Merge branch 'netlayer' of https://github.com/mrosseel/bisq-exchange into mrosseel-netlayer
2017-11-04 10:51:08 -05:00
Mike Rosseel
f1afee48dc
Bug fix in WalletSetup
...
so far i understand your version is working bc another bug in the
walletsetup where the Socks5MultiDiscovery is not used. so u use default
dnsdiscover which leaks dns. that works only with SafeSocks 0.
if using Socks5MultiDiscovery as is it should i only get 4 nodes form dns seeds.
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-11-04 16:33:20 +01:00
Manfred Karrer
ff3ebff823
Merge branch 'netlayer' of https://github.com/mrosseel/bisq-exchange into mrosseel-netlayer
2017-11-04 10:00:14 -05:00
Mike Rosseel
9ff586c973
Don't make a subdir for tor hostname/private key
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-11-04 15:54:09 +01:00
Manfred Karrer
b8bec7e290
Merge branch 'netlayer' of https://github.com/mrosseel/bisq-exchange into mrosseel-netlayer
2017-11-04 09:36:14 -05:00
Mike Rosseel
ac26230cea
Delete the jsocks, jtorproxy and jtorctl modules, no longer needed
...
Replaced by the new netlayer library
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-11-04 15:20:19 +01:00
Mike Rosseel
ded10973bc
Update of bitcoin mainnet onion nodes
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-11-04 15:19:15 +01:00
Manfred Karrer
95d91f4ce0
Merge branch 'netlayer' of https://github.com/mrosseel/bisq-exchange into mrosseel-netlayer
2017-11-04 08:55:29 -05:00
Mike Rosseel
ce402a50da
Switch temporarily to my fork so the SafeSocks fix can be tested
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-11-04 12:25:51 +01:00
Manfred Karrer
0cd9f7448b
Merge branch 'netlayer' of https://github.com/mrosseel/bisq-exchange into mrosseel-netlayer
2017-11-03 11:51:26 -05:00
Manfred Karrer
d8845f0cc6
Refactor getWitness method
2017-11-03 11:48:22 -05:00
Manfred Karrer
00d868dd9d
Remove excuded keys when requesting the account witness data
2017-11-03 11:22:19 -05:00
Mike Rosseel
1578340c78
Fix Bridges UI, remove triggering of bridges mode (testing code)
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-11-03 15:11:06 +01:00
Mike Rosseel
dfb7745f27
Merge remote-tracking branch 'upstream/Development' into netlayer
2017-11-02 16:24:46 +01:00
Manfred Karrer
415d02d6d7
Merge branch 'netlayer' of https://github.com/mrosseel/bisq-exchange into mrosseel-netlayer
2017-11-02 10:23:48 -05:00
Manfred Karrer
2621f1d639
Merge branch 'Development' into mrosseel-netlayer
2017-11-02 10:05:27 -05:00
Mike Rosseel
c7e51e1593
Fixed the nullable bridgeAddresses proto handling
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-11-02 16:04:56 +01:00
Manfred Karrer
46b3c3e8be
Merge branch 'netlayer' of https://github.com/mrosseel/bisq-exchange into mrosseel-netlayer
2017-11-02 10:03:21 -05:00
Mike Rosseel
0ec4b5edac
Merging and adapting old bridges UI code to new bisq structure
...
Had to merge by hand because of the many changes in the new bisq
structure. Also removed the 'default bridges' concept because it's
discouraged to do that.
Open issues: UI screen is still WIP, and bitcoinj SOCKS proxy error
which makes that we can't connect to bitcoin nodes anymore.
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-11-02 15:50:06 +01:00
Manfred Karrer
f1a3c6e7b2
Fix bugs described in issue #989
2017-11-01 18:38:00 -05:00
Mike Rosseel
af39d00e6b
Cleanup of TorNetworkNode, re-enable LocalhostNetworkNode
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-31 16:23:55 +01:00
Manfred Karrer
ab4d7b066b
Fix bug with not displaying correct price market label and latest bisq price
2017-10-30 18:52:41 -05:00
Manfred Karrer
af7effc1d8
Merge branch 'ajustFee' into Development
2017-10-30 15:58:21 -05:00
Manfred Karrer
a323d31ee1
Merge branch 'ajustFee' into mrosseel-netlayer
2017-10-30 15:58:09 -05:00
Manfred Karrer
492af767f0
Merge branch 'ivkovnikola-Development' into Development
2017-10-30 15:10:41 -05:00
Manfred Karrer
57069900ee
Fix position in list of new altcoin
2017-10-30 15:10:18 -05:00
Manfred Karrer
c5af0808b3
Merge branch 'Development' of https://github.com/ivkovnikola/exchange into ivkovnikola-Development
2017-10-30 12:32:23 -05:00
Manfred Karrer
c9315b7b19
Merge branch 'netlayer' of https://github.com/mrosseel/bisq-exchange into mrosseel-netlayer
2017-10-30 12:08:47 -05:00
Manfred Karrer
2c44efa971
Fix date column width in tx list
2017-10-30 08:17:42 -05:00
Mike Rosseel
ebe23a8c62
Merge remote-tracking branch 'upstream/Development' into netlayer
...
Conflicts:
network/pom.xml
network/src/main/java/io/bisq/network/p2p/network/TorNetworkNode.java
2017-10-30 12:59:57 +01:00
Mike Rosseel
f4ecad47d1
Clean up of TorNetworkNode, added working commit of netlayer to pom
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-30 12:56:12 +01:00
Manfred Karrer
e7fa8dbbb3
Change price relay node address
2017-10-29 21:36:10 -05:00
Manfred Karrer
c0b5e37786
Adjust bitcoin average price request intervals
2017-10-29 20:26:57 -05:00
Manfred Karrer
102d80753c
Merge branch 'sqrrm-issue559-tradeschart' into Development
2017-10-29 16:09:01 -05:00
sqrrm
bd1848bba3
Fix #559 , misaligned trade data
...
Store the ticks to be displayed for easier reference and comparison
rather. Properly handle intervals for the local time zone.
2017-10-29 10:50:46 +01:00
sqrrm
7d70f61e68
Fix TradesChartsViewModelTest
...
These tests now run. One test fails due a TradesChartsViewModel
bug/inconsistency, to be fixed.
2017-10-29 10:50:46 +01:00
Manfred Karrer
ae0aef325d
Fix wording
2017-10-27 19:58:48 -05:00
Manfred Karrer
d939c902f0
Fix wrong redundatnt % symbol in take offer screen
2017-10-27 19:42:06 -05:00
Manfred Karrer
63cdbaf23b
Fix wrong currency display and text in take offer screen
2017-10-27 19:38:22 -05:00
Manfred Karrer
065a57606a
Show recommended miner fee in popup when ask user for funding offer
2017-10-27 18:25:08 -05:00
Manfred Karrer
c190d7f1df
Remove balance listener when taking offer
2017-10-27 17:49:38 -05:00
Manfred Karrer
412fba82c3
Remove balance listener when placing offer
2017-10-27 17:47:02 -05:00
ivkovnikola
8a3abcca43
Merge request for INXT
2017-10-27 20:23:57 +02:00
Manfred Karrer
9ff2c643bd
Only show fee info popup once
2017-10-27 11:40:47 -05:00
