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
Mike Rosseel
5fc596b805
Integrate 0.3.1 version of netlayer, still not working.
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-27 15:00:15 +02:00
Manfred Karrer
6e4175f480
Add all missing counties
2017-10-26 21:45:46 -05:00
Manfred Karrer
462fc2a472
Remove maxTradePeriod from PaymentAccountPayload
2017-10-26 19:54:06 -05:00
Manfred Karrer
61d64a341d
Change account age based limit in SECOND_PHASE
2017-10-26 19:30:52 -05:00
Manfred Karrer
2a0547d508
Show popup if seed or price relay node get banned. Cleanups.
2017-10-26 19:01:36 -05:00
Manfred Karrer
afaabf9e36
Add support of seed and price rleay node filters. Use guice in P2P network domain classes.
2017-10-26 15:46:48 -05:00
Mike Rosseel
98c8da56c9
Port to the new java netlayer library
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-26 10:56:50 +02:00
Manfred Karrer
90cfc84d35
Add filter for seed and price relay nodes
2017-10-25 19:16:52 -05:00
Manfred Karrer
2c84623154
Add filter for arbitrators
2017-10-25 17:24:54 -05:00
Manfred Karrer
3c93bb4527
Reduce trade fees
2017-10-25 16:38:44 -05:00
Manfred Karrer
b7c7f6f615
Reduce security deposit
2017-10-25 16:31:40 -05:00
Manfred Karrer
7b072fee83
Reduce logo size in readme.md
2017-10-25 16:11:49 -05:00
Manfred Karrer
a98438561f
Reduce logo size in readme.md
2017-10-25 16:10:45 -05:00
Manfred Karrer
28eceaec53
Fix markdown in readme.md
2017-10-25 16:10:20 -05:00
Manfred Karrer
8ff42c9746
Reduce logo size in readme.md
2017-10-25 16:09:31 -05:00
