Commit graph

1643 commits

Author SHA1 Message Date
Manfred Karrer
2621f1d639
Merge branch 'Development' into mrosseel-netlayer 2017-11-02 10:05:27 -05: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
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
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
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
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
462fc2a472
Remove maxTradePeriod from PaymentAccountPayload 2017-10-26 19:54:06 -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
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
d6e1f954b7
Merge remote-tracking branch 'origin/Development' into Development 2017-10-25 16:04:19 -05:00
Manfred Karrer
f24cbd9592
Merge Terracoin 2017-10-25 16:04:01 -05:00
Manfred Karrer
e8290e3b8a
Fix missing verifications, handle altcoins, cleanup 2017-10-25 14:18:26 -05:00
Manfred Karrer
75e95aef92
Use peers witness not the one from the offer for verification call 2017-10-22 22:06:04 -05:00
Manfred Karrer
fe4514b460
Remove PublishAccountAgeWitness task 2017-10-22 19:48:34 -05:00
Manfred Karrer
611428f5f0
Use peers currnet date for witness age calculation 2017-10-22 19:22:46 -05:00
Manfred Karrer
7c78db5101
Apply account age limit in take offer screen 2017-10-21 20:51:41 -05:00
Manfred Karrer
801a9174ad
Dont publish altcoin account witness 2017-10-21 20:32:05 -05:00
Manfred Karrer
df8ed79e0c
Set extraMap to null with altcoins 2017-10-21 20:30:44 -05:00
Manfred Karrer
e56fc44956
Only use accumulated hash in Witness object 2017-10-21 14:07:48 -05:00
Manfred Karrer
a33923cc1e
Add missing linebreak 2017-10-21 09:11:18 -05:00
Manfred Karrer
085f6b354b
Merge branch 'Development' into PaymentAccountAgeVerification 2017-10-20 18:54:23 -05:00
Manfred Karrer
1206878579
Add peers account age witness verifications in trade process 2017-10-17 20:41:33 -05:00
Manfred Karrer
5f9d59143e
Add salt field to payment method forms 2017-10-16 18:44:42 -05:00
Manfred Karrer
b60579fc37
Add account age to payment method forms 2017-10-16 18:16:24 -05:00
Manfred Karrer
f6c0d02bc3
Refactor: Rename addAllowedPeriod to addLimitations 2017-10-16 17:01:00 -05:00
Manfred Karrer
654270ec94
Add maxTradeLimit to BtcValidator 2017-10-16 17:00:16 -05:00
Manfred Karrer
851792d1f1
Add new P2P network data structure for AccountAgeWitness without pubKey 2017-10-16 15:52:54 -05:00
diego-ab
7b19f2642c Add Terracoin 2017-10-16 21:47:03 +01:00
Manfred Karrer
0f322ad37f
Add PB support for excludeFromJsonDataMap to all PaymentPayload classes 2017-10-15 13:36:12 -05:00
vroehrig
801ffaefce Update AltCoinAddressValidator.java 2017-10-15 08:22:12 +13:00
Manfred Karrer
a3ab418079
Filter offer by account age withness age (WIP) 2017-10-14 12:54:03 -05:00
Manfred Karrer
cb50faca95
Apply age based trade limit to offer 2017-10-13 21:36:15 -05:00
Manfred Karrer
b1a45f5365
Show account age and categroy in PeerIcon 2017-10-13 20:32:23 -05:00
vroehrig
1e6c12cec7 Update AltCoinAddressValidator.java 2017-10-14 13:16:07 +13:00
vroehrig
5dbb545bdd Create XCNAddressValidator.java 2017-10-14 13:14:35 +13:00