Commit graph

7241 commits

Author SHA1 Message Date
Florian Reimair
90f3ccd5a6 activate commandline argument parser 2018-11-09 15:40:45 +01:00
aejontargaryen
dd6fd3a76e update altcoin info popups 2018-11-09 08:41:43 +00:00
Manfred Karrer
33f671ed8b
Cleanup 2018-11-08 20:22:40 -05:00
Manfred Karrer
5a9ff12669
Merge branch 'release-candidate-0.9.0' into add-asset-listing-fee
# Conflicts:
#	desktop/src/main/java/bisq/desktop/util/GUIUtil.java
#	desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java
2018-11-08 16:59:36 -05:00
Manfred Karrer
6861e76d61
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	desktop/src/main/java/bisq/desktop/util/GUIUtil.java
#	desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java
#	gradle/witness/gradle-witness.gradle
2018-11-08 16:55:03 -05:00
Manfred Karrer
62dde9b117
Merge branch 'cbeams-delist-untraded-assets' 2018-11-08 16:48:39 -05:00
Manfred Karrer
c9e95013c3
Merge branch 'delist-untraded-assets' of https://github.com/cbeams/bisq into cbeams-delist-untraded-assets
# Conflicts:
#	assets/src/main/resources/META-INF/services/bisq.asset.Asset
#	core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
2018-11-08 16:48:22 -05:00
Manfred Karrer
ca4a4a47ce
Add asset listing fee and proof of burn domain and views (WIP) 2018-11-08 16:44:58 -05:00
Manfred Karrer
e8ead2dfbd
Merge pull request #1893 from freimair/torrc
Torrc
2018-11-08 11:44:07 -05:00
Manfred Karrer
156ad77f4e
Merge pull request #1900 from ripcurlx/adapt-arbitration-layout
Redesign: Adapt dispute flow to match new design
2018-11-08 11:37:16 -05:00
Christoph Atteneder
d843e73b7f
Adapt dispute flow to match new design 2018-11-08 17:08:51 +01:00
Manfred Karrer
ac6d8121a2
Merge pull request #1895 from ManfredKarrer/support-removed-assets
Support handling of removed assets.
2018-11-08 09:02:58 -05:00
Florian Reimair
7b98445eb9 use program arguments instead of system properties 2018-11-08 14:56:44 +01:00
Manfred Karrer
f6d8b69c90
Merge pull request #1898 from ripcurlx/styling-improvements
Redesign: Cleanup of multiple views
2018-11-08 07:57:57 -05:00
Christoph Atteneder
f590c23b50
Improve layout 2018-11-08 11:27:28 +01:00
Christoph Atteneder
ccfa635397
Adapt style of interval selector 2018-11-08 11:25:52 +01:00
Christoph Atteneder
3b43861f62
Position create offer buttons to the top 2018-11-08 11:05:36 +01:00
Christoph Atteneder
e7ea6c7c3a
Improve layout of About and Preferences 2018-11-08 10:40:12 +01:00
Christoph Atteneder
c046239338
Adapt tor network settings popup 2018-11-08 10:31:24 +01:00
Florian Reimair
5ab801cad2 readability 2018-11-08 10:13:29 +01:00
Manfred Karrer
cfb88ebf29
cleanup 2018-11-07 20:56:42 -05:00
Manfred Karrer
f0c435a6bb
Merge 2018-11-07 20:56:35 -05:00
Manfred Karrer
53e127f556
Add asset listing params 2018-11-07 20:56:22 -05:00
Manfred Karrer
e8df2b533e
Merge branch 'cbeams-delist-untraded-assets' into add-asset-listing-fee
# Conflicts:
#	core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
2018-11-07 19:35:47 -05:00
Manfred Karrer
b69f5cac23
Merge branch 'support-removed-assets' into add-asset-listing-fee
# Conflicts:
#	desktop/src/main/java/bisq/desktop/util/GUIUtil.java
#	desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java
2018-11-07 19:32:00 -05:00
Manfred Karrer
2bd819a463
Remove commented out print code 2018-11-07 19:30:02 -05:00
Manfred Karrer
36df44db33
Add comment 2018-11-07 17:35:21 -05:00
Manfred Karrer
f59bbefe21
Move asset trade activity code to new class 2018-11-07 17:32:54 -05:00
Manfred Karrer
64c4522e88
Decrease required trade volume. Add better log for not traded assets 2018-11-07 17:25:22 -05:00
Manfred Karrer
4fd86c64e3
Fix tests and improve the isCryptoCurrency method.
- We return true at isCryptoCurrency in those cases:
- The code is BTC
- The code is found in assetRegistry
- If not found we check if we have a fiat currency for that code,
if not we treat it as crypto (case of a removed asset)
2018-11-07 16:31:32 -05:00
Manfred Karrer
ab14e69a6c
Merge branch 'delist-untraded-assets' of https://github.com/cbeams/bisq into cbeams-delist-untraded-assets 2018-11-07 14:06:33 -05:00
Manfred Karrer
8982f108cb
Support handling of removed assets.
- cross check the isCryptoCurrency method if the symbol matches any
fiat currency and of both not match consider it still a CC. In case of
a removed asset it was returning false before which caused an issue in
the trade currency pair showing both sides as BTC.
- Show N/A for name in case the asset is not available.

The code mostly operates with the ticker symbol which gets stored in
the offer, so even an asset is removed traders who have that asset in
their account list can trade without problems.
Tested create offer, take offer and executing a trade.
2018-11-07 14:01:58 -05:00
Christoph Atteneder
1082340701
Adapt user avatar info popup 2018-11-07 19:54:19 +01:00
Florian Reimair
3d53c2584a comply to coding conventions 2018-11-07 19:44:17 +01:00
Christoph Atteneder
999906929b
Remove unnecessary string removal 2018-11-07 19:40:31 +01:00
Manfred Karrer
dc9762b7b3
Merge pull request #1891 from diablax/list-mask-project
List Mask (MASK)
2018-11-07 13:10:38 -05:00
Manfred Karrer
95ba95d822
Merge branch 'master' into release-candidate-0.9.0 2018-11-07 12:36:23 -05:00
Chris Beams
53948f372a
Merge pull request #1894 from cbeams/fix-dependency-resolution
Resolve project dependencies from Maven Central vs JCenter
2018-11-07 18:32:38 +01:00
Chris Beams
36b884e3d8
Resolve project dependencies from Maven Central vs JCenter
This change avoids the as-yet unexplained resolution errors we've been
seeing out of JCenter today, which look like the following:

    Could not resolve all files for configuration ':monitor:compileClass
    > Could not resolve net.gpedro.integrations.slack:slack-webhook:1.1.
      Required by:
          project :monitor
       > Could not resolve net.gpedro.integrations.slack:slack-webhook:1
          > Could not get resource 'http://jcenter.bintray.com/net/gpedr
             > Could not HEAD 'http://jcenter.bintray.com/net/gpedro/int
                > sun.security.validator.ValidatorException: PKIX path b

For full context, see the Travis CI build failure at
https://travis-ci.org/bisq-network/bisq/builds/451786384#L678-L679.

It is assumed this is an issue on the JCenter side, e.g. something to do
with the interaction of JCenter servers and their SSL implementation
when accessed under OpenJDK 10 and its TrustStore implementation. This
specific failure does not occur under Oracle JDK 11, but other
dependencies do fail in a similar but non-deterministic fashion. In any
case, resolving project dependencies from Maven Central solves the
problem in the meantime.

See also https://github.com/gradle/gradle/issues/6630.
2018-11-07 18:12:42 +01:00
Florian Reimair
03683a7ecd got rid of magic strings 2018-11-07 17:13:51 +01:00
Florian Reimair
7b07a1585b custom override of torrc 2018-11-07 17:13:51 +01:00
Florian Reimair
a46328fa41 custom torrc file available 2018-11-07 17:13:51 +01:00
Florian Reimair
73fc35413b bumped netlayer to 0.4.7 2018-11-07 17:13:51 +01:00
Christoph Atteneder
78e01f92da
Clean up TradeDetailsWindow 2018-11-07 16:48:32 +01:00
Christoph Atteneder
3887d4b49c
Merge pull request #1892 from ripcurlx/adapt-trade-process
Redesign: Adapt trade process
2018-11-07 16:11:45 +01:00
Christoph Atteneder
d59793eae0
Fix validation display error when switching between payment methods 2018-11-07 14:54:56 +01:00
Christoph Atteneder
055fc9ee12
Fix bottom padding 2018-11-07 14:45:46 +01:00
Christoph Atteneder
729eacd6d0
Adapt trade process to new design 2018-11-07 14:43:00 +01:00
diablax
8aca297edf List Mask (MASK) 2018-11-07 03:28:34 -08:00
Chris Beams
d910ca62d1
Merge pull request #1890 from devinbileck/Fix-pricenode-gradle-build
Fix pricenode gradle build
2018-11-07 10:17:40 +01:00