mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-27 08:31:00 +01:00
Code Issues Projects Releases Packages Wiki Activity
7456 commits 3 branches 150 tags 4.1 GiB
Commit graph

7456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
16e4b72d4d
Fix tests 2018-11-12 00:25:25 -05:00
Manfred Karrer
9f9349c835
Fix issues with wrong base currency 
From the changes in isCryptoCurrency which return true in case of BTC
there have been some bugs. We changed the check to distinguish between
altcoin and fiat to check for BTC as base currency now.
That area would require a bigger refactoring...
 2018-11-11 18:00:43 -05:00
Manfred Karrer
cf46f0b06a
Do not show popup in devmode 2018-11-11 17:20:08 -05:00
Manfred Karrer
5019135941
Merge pull request #1904 from ManfredKarrer/add-asset-listing-fee 
Add asset listing fee
 2018-11-11 17:10:45 -05:00
Manfred Karrer
87efe89662
Add proof of burn feature to dao 2018-11-11 12:56:54 -05:00
Manfred Karrer
82884d5332
Merge branch 'release-candidate-0.9.0' into add-proof-of-burn-feature 2018-11-10 13:29:53 -05:00
Manfred Karrer
ef9636157e
Merge branch 'release-candidate-0.9.0' into add-asset-listing-fee 2018-11-10 13:29:13 -05:00
Manfred Karrer
c2cb0e2965
Merge pull request #1902 from aejontargaryen/update-altcoin-account-popups 
Update altcoin accounts info popups
 2018-11-10 13:27:38 -05:00
Manfred Karrer
5dbdfbfc29
Update displayStrings.properties 2018-11-10 13:27:00 -05:00
Manfred Karrer
13ca7b4714
Merge pull request #1906 from sqrrm/btcnode-ip-update 
Update btc node ip
 2018-11-10 09:19:37 -05:00
sqrrm
fbfdf94dca
Update btc node ip 2018-11-10 14:56:08 +01:00
Manfred Karrer
27dea71bfd
Optimize processing of initial trade statistics and witness data 
We changed the earlier behaviour with delayed execution of chunks of the list as it caused
worse results as if it is processed in one go.
Main reason is probably that listeners trigger more code and if that is called early at
startup we have better chances that the user has not already navigated to a screen where the
trade statistics are used for UI rendering.
We need to take care that the update period between releases stay short as with the current
situation before 0.9 release we receive 4000 objects with a newly installed client, which
causes the application to stay stuck for quite a while at startup.
 2018-11-09 20:43:07 -05:00
Manfred Karrer
9678516c2a
Replace containsKey with putIfAbsent call. Remove log. 2018-11-09 20:35:58 -05:00
Manfred Karrer
d8bae356ff
Complete asset listing fee feature 2018-11-09 20:24:17 -05:00
Manfred Karrer
fa911e96ed
Merge pull request #1903 from freimair/torrc 
engage commandline argument parser
 2018-11-09 10:25:17 -05:00
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