Skip to content
Permalink
Browse files

merge 2.5.0

  • Loading branch information...
NayiemWillems committed Jul 3, 2019
1 parent c231579 commit 75adb2d6d0fd02ed6e9d9dd15a64f5193edaa683
Showing with 1,341 additions and 1,492 deletions.
  1. +6 −6 README.md
  2. +5 −7 config/index.js
  3. +0 −64 config/networks/devnet.json
  4. +18 −35 config/networks/mainnet.json
  5. +0 −26 config/peers/devnet.json
  6. +33 −304 config/peers/mainnet.json
  7. +10 −10 package.json
  8. +1 −1 src/index.ejs
  9. BIN src/renderer/assets/images/ark-logo.png
  10. +18 −24 src/renderer/assets/images/default.svg
  11. +33 −24 src/renderer/assets/images/networks/ark.devnet.svg
  12. +18 −24 src/renderer/assets/images/networks/ark.mainnet.svg
  13. +31 −75 src/renderer/assets/images/pages/contact-new/wallet.svg
  14. +126 −193 src/renderer/assets/images/pages/intro/duty.svg
  15. +158 −192 src/renderer/assets/images/pages/intro/power.svg
  16. +134 −155 src/renderer/assets/images/pages/intro/responsibility.svg
  17. +65 −159 src/renderer/assets/images/pages/intro/turn.svg
  18. +20 −28 src/renderer/assets/images/pages/intro/welcome.svg
  19. +18 −1 src/renderer/assets/images/pages/network-selection/background.svg
  20. +49 −46 src/renderer/assets/images/pages/profile-new/step-1.svg
  21. +19 −15 src/renderer/assets/images/pages/profile-new/step-2.svg
  22. +32 −1 src/renderer/assets/images/pages/wallet-new/choose-wallet.svg
  23. +29 −1 src/renderer/assets/images/pages/wallet-new/encrypt-wallet.svg
  24. +50 −1 src/renderer/assets/images/pages/wallet-new/import-wallet.svg
  25. +30 −1 src/renderer/assets/images/pages/wallet-new/protect-wallet.svg
  26. BIN src/renderer/assets/images/wallpapers/1Default.png
  27. BIN src/renderer/assets/images/wallpapers/2Default.png
  28. BIN src/renderer/assets/images/wallpapers/3Default.png
  29. BIN src/renderer/assets/images/wallpapers/4Default.png
  30. BIN src/renderer/assets/images/wallpapers/5Default.png
  31. BIN src/renderer/assets/images/wallpapers/Space2.jpg
  32. BIN src/renderer/assets/images/wallpapers/Space3.jpg
  33. BIN src/renderer/assets/images/wallpapers/blur-red.jpg
  34. +19 −0 src/renderer/assets/svg/bitcointalk.svg
  35. +1 −0 src/renderer/assets/svg/discord.svg
  36. +5 −0 src/renderer/assets/svg/email.svg
  37. +41 −0 src/renderer/assets/svg/facebook.svg
  38. +3 −8 src/renderer/assets/svg/filter.svg
  39. +14 −0 src/renderer/assets/svg/github.svg
  40. +67 −0 src/renderer/assets/svg/instagram.svg
  41. +1 −0 src/renderer/assets/svg/link.svg
  42. +44 −0 src/renderer/assets/svg/linkedin.svg
  43. +6 −0 src/renderer/assets/svg/medium.svg
  44. +57 −0 src/renderer/assets/svg/reddit.svg
  45. +47 −0 src/renderer/assets/svg/skype.svg
  46. +21 −0 src/renderer/assets/svg/telegram.svg
  47. +48 −0 src/renderer/assets/svg/twitter.svg
  48. +15 −0 src/renderer/assets/svg/valkyrie.svg
  49. +1 −1 src/renderer/components/App/AppFooter.vue
  50. +11 −11 src/renderer/i18n/locales/en-US.js
  51. +33 −66 src/renderer/i18n/locales/it-IT.js
  52. +1 −1 src/renderer/pages/NetworkOverview.vue
  53. +1 −1 src/renderer/services/uri-handler.js
  54. +1 −2 src/renderer/store/modules/peer.js
  55. +1 −9 yarn.lock
@@ -1,19 +1,19 @@
# Ark Desktop Wallet
# Qredit Desktop Portal

![Ark Desktop Wallet](./banner.png)
![Qredit Desktop Portal](./banner.png)

[![Build Status](https://badgen.now.sh/circleci/github/ArkEcosystem/desktop-wallet)](https://circleci.com/gh/ArkEcosystem/desktop-wallet)
[![Latest Version](https://badgen.now.sh/github/release/ArkEcosystem/desktop-wallet)](https://github.com/ArkEcosystem/desktop-wallet/releases)
[![Build Status](https://badgen.now.sh/circleci/github/qredit/desktop-wallet)](https://circleci.com/gh/ArkEcosystem/desktop-wallet)
[![Latest Version](https://badgen.now.sh/github/release/qredit/desktop-wallet)](https://github.com/ArkEcosystem/desktop-wallet/releases)
[![License: MIT](https://badgen.now.sh/badge/license/MIT/green)](https://opensource.org/licenses/MIT)

## Download
[Latest Release](https://github.com/ArkEcosystem/ark-desktop/releases)
[Latest Release](https://github.com/qredit/qredit-desktop/releases)

## Installing via Package Managers

### Arch Linux

Install via [AUR](https://aur.archlinux.org/packages/ark-desktop):
Install via [AUR](https://aur.archlinux.org/packages/qredit-desktop):

> Manjaro
@@ -2,26 +2,24 @@ const os = require('os')
const path = require('path')

exports.APP = {
website: 'https://ark.io',
website: 'https://qredit.io',
transactionExpiryMinutes: 45
}

exports.NETWORKS = [
require('./networks/mainnet.json'),
require('./networks/devnet.json')
require('./networks/mainnet.json')
]

exports.PEERS = {
'ark.mainnet': require('./peers/mainnet.json'),
'ark.devnet': require('./peers/devnet.json')
'ark.mainnet': require('./peers/mainnet.json')
}

exports.ANNOUNCEMENTS = {
rssUrl: 'https://blog.ark.io/feed'
rssUrl: 'https://medium.com/feed/@hodlerenterprises'
}

exports.VENDOR_FIELD = {
defaultMaxLength: 64
defaultMaxLength: 255
}

exports.I18N = {

This file was deleted.

@@ -1,15 +1,15 @@
{
"id": "ark.mainnet",
"name": "ARK Mainnet",
"title": "ARK Mainnet",
"server": "https://explorer.ark.io:8443",
"description": "The ARK Mainnet should be chosen in most cases.",
"name": "Qredit",
"title": "Qredit",
"server": "http://136.144.170.17:4103",
"description": "Qredit",
"imagePath": "networks/ark.png",
"apiVersion": 2,
"slip44": "111",
"slip44": "1",
"market": {
"enabled": true,
"ticker": "ARK"
"ticker": "XQR"
},
"feeStatistics": [
{
@@ -49,38 +49,21 @@
"activeDelegates": 51,
"epoch": "2017-03-21T13:00:00.000Z"
},
"vendorField": {
"vendorField": {
"maxLength": 255
},
"nethash": "6e84d08bd299ed97c212c886c98a57e36545c8f5d645ca7eeae63a8bd62d8988",
"explorer": "https://explorer.ark.io",
"token": "ARK",
"nethash": "5e67037fd290ba7ab378e84a591d251c46eb9770eb134983771fd602233bf193",
"explorer": "https://explorer.qredit.io",
"token": "XQR",
"subunit": "arktoshi",
"symbol": "Ѧ",
"symbol": "XQR",
"fractionDigits": 8,
"version": 23,
"wif": 170,
"version": 58,
"wif": 187,
"knownWallets": {
"AagJoLEnpXYkxYdYkmdDSNMLjjBkLJ6T67": "ACF Hot Wallet",
"AWkBFnqvCF4jhqPSdE2HBPJiwaf67tgfGR": "ACF Hot Wallet (old)",
"ANvR7ny44GrLy4NTfuVqjGYr4EAwK7vnkW": "Altilly",
"AYCTHSZionfGoQsRnv5gECEuFWcZXS38gs": "Ark Bounty",
"AZmQJ2P9xg5j6VPZWjcTzWDD4w7Qww2KGX": "Ark GitHub Bounty",
"ANkHGk5uZqNrKFNY5jtd4A88zzFR3LnJbe": "Ark Hot Wallet",
"ALgvTAoz5Vi9easHqBK6aEMKatHb4beCXm": "Ark Shield I",
"AdTyTzaXPtj1J1DzTgVksa9NYdUuXCRbm1": "Ark Shield II",
"AUDud8tvyVZa67p3QY7XPRUTjRGnWQQ9Xv": "Ark Team",
"AFrPtEmzu6wdVpa2CnRDEKGQQMWgq8nE9V": "Binance",
"AQkyi31gUbLuFp7ArgH9hUCewg22TkxWpk": "Binance Cold Wallet",
"AdS7WvzqusoP759qRo6HDmUz2L34u4fMHz": "Binance Cold Wallet II",
"Aakg29vVhQhJ5nrsAHysTUqkTBVfmgBSXU": "Binance Cold Wallet III",
"AUexKjGtgsSpVzPLs6jNMM6vJ6znEVTQWK": "Bittrex",
"AdA5THjiVFAWhcMo5QyTKF1Y6d39bnPR2F": "Changelly",
"AcPwcdDbrprJf8FNCE3dKZaTvPJT8y4Cqi": "COSS",
"AJbmGnDAx9y91MQCDApyaqZhn6fBvYX9iJ": "Cryptopia",
"AewxfHQobSc49a4radHp74JZCGP8LRe4xA": "Genesis Wallet",
"AcVHEfEmFJkgoyuNczpgyxEA3MZ747DRAu": "Livecoin",
"ARXhacG5MPdT1ehWPTPo8jtfC5NrS29eKS": "OKEx",
"ANQftoXeWoa9ud9q9dd2ZrUpuKinpdejAJ": "Upbit"
}
"QjmG1PUnCh1ip9tZnt24FAQv9eXnsERsYk": "Altilly",
"QMRhJyc1GDavB8RStdkPpaEbjrziYxgdsv": "Qredit",
"QXcPMXiHx2cZ8RGmFCu8yUCWFMxMiLGv1H": "Qredit Shield",
"QPhFPEEXwZAT7WZSmFttDo3oCjeQufuke3": "Genesis"
}
}

This file was deleted.

0 comments on commit 75adb2d

Please sign in to comment.
You can’t perform that action at this time.