mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Development' into issue544-api

Browse Source
This commit is contained in:
Mike Rosseel 2017-07-25 13:35:13 +02:00
commit 0c1cf298f6
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -25,7 +25,7 @@ Building from source
See [doc/build.md](doc/build.md). See [doc/build.md](doc/build.md).
[AUR for Arch Linux](https://aur.archlinux.org/packages/bitsquare-git) [AUR for Arch Linux](https://aur.archlinux.org/packages/bisq-git/)
Staying in Touch Staying in Touch

6
common/src/main/java/io/bisq/common/locale/CurrencyUtil.java
View File

@ -138,9 +138,12 @@ public class CurrencyUtil {
result.add(new CryptoCurrency("ETC", "Ether Classic")); result.add(new CryptoCurrency("ETC", "Ether Classic"));
result.add(new CryptoCurrency("ERC", "Europecoin")); result.add(new CryptoCurrency("ERC", "Europecoin"));
result.add(new CryptoCurrency("EGC", "EverGreenCoin")); result.add(new CryptoCurrency("EGC", "EverGreenCoin"));
result.add(new CryptoCurrency("EOS", "EOS", true));
result.add(new CryptoCurrency("FCT", "Factom")); result.add(new CryptoCurrency("FCT", "Factom"));
result.add(new CryptoCurrency("FAIR", "FairCoin")); result.add(new CryptoCurrency("FAIR", "FairCoin"));
result.add(new CryptoCurrency("FLO", "FlorinCoin")); result.add(new CryptoCurrency("FLO", "FlorinCoin"));
//TODO ticker?
//result.add(new CryptoCurrency("FILE", "Filecoin", true));
result.add(new CryptoCurrency("GAME", "GameCredits")); result.add(new CryptoCurrency("GAME", "GameCredits"));
result.add(new CryptoCurrency("GEMZ", "Gemz")); result.add(new CryptoCurrency("GEMZ", "Gemz"));
result.add(new CryptoCurrency("GRC", "Gridcoin")); result.add(new CryptoCurrency("GRC", "Gridcoin"));
@ -149,6 +152,7 @@ public class CurrencyUtil {
result.add(new CryptoCurrency("HODL", "HOdlcoin")); result.add(new CryptoCurrency("HODL", "HOdlcoin"));
result.add(new CryptoCurrency("HNC", "HunCoin")); result.add(new CryptoCurrency("HNC", "HunCoin"));
result.add(new CryptoCurrency("IOC", "I/O Coin")); result.add(new CryptoCurrency("IOC", "I/O Coin"));
result.add(new CryptoCurrency("IOTA", "IOTA", true));
result.add(new CryptoCurrency("IOP", "Fermat")); result.add(new CryptoCurrency("IOP", "Fermat"));
result.add(new CryptoCurrency("JNS", "Janus", true)); result.add(new CryptoCurrency("JNS", "Janus", true));
result.add(new CryptoCurrency("JPYT", "JPY Tether")); result.add(new CryptoCurrency("JPYT", "JPY Tether"));
@ -245,8 +249,6 @@ public class CurrencyUtil {
if (!baseCurrencyCode.equals("DASH")) if (!baseCurrencyCode.equals("DASH"))
result.add(new CryptoCurrency("DASH", "Dash")); result.add(new CryptoCurrency("DASH", "Dash"));
result.add(new CryptoCurrency("DCR", "Decred")); result.add(new CryptoCurrency("DCR", "Decred"));
if (!baseCurrencyCode.equals("DOGE"))
result.add(new CryptoCurrency("DOGE", "Dogecoin"));
result.add(new CryptoCurrency("ETH", "Ether")); result.add(new CryptoCurrency("ETH", "Ether"));
result.add(new CryptoCurrency("ETC", "Ether Classic")); result.add(new CryptoCurrency("ETC", "Ether Classic"));
result.add(new CryptoCurrency("GRC", "Gridcoin")); result.add(new CryptoCurrency("GRC", "Gridcoin"));

4
gui/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DownloadTask.java
View File

@ -91,11 +91,11 @@ public class DownloadTask extends Task<List<FileDescriptor>> {
return fileDescriptor; return fileDescriptor;
}) })
.map(fileDescriptor -> { .map(fileDescriptor -> {
log.info("Downloading {}", fileDescriptor.getFileName()); log.info("Downloading {}", fileDescriptor.getLoadUrl());
try { try {
updateMessage(fileDescriptor.getFileName()); updateMessage(fileDescriptor.getFileName());
download(new URL(fileDescriptor.getLoadUrl()), fileDescriptor.getSaveFile()); download(new URL(fileDescriptor.getLoadUrl()), fileDescriptor.getSaveFile());
log.info("Download for {} done", fileDescriptor.getFileName()); log.info("Download for {} done", fileDescriptor.getLoadUrl());
fileDescriptor.setDownloadStatus(BisqInstaller.DownloadStatusEnum.OK); fileDescriptor.setDownloadStatus(BisqInstaller.DownloadStatusEnum.OK);
} catch (Exception e) { } catch (Exception e) {
fileDescriptor.setDownloadStatus(BisqInstaller.DownloadStatusEnum.FAIL); fileDescriptor.setDownloadStatus(BisqInstaller.DownloadStatusEnum.FAIL);