Skip to content

Commit

Permalink
Merge pull request #460 from theQRL/master
Browse files Browse the repository at this point in the history 
Latest node version
  • Loading branch information
@jplomas
jplomas committed Nov 25, 2020
2 parents 8cbe56d + cc07fbc commit a79a33c
Show file tree
Hide file tree
Showing 3,448 changed files with 474,817 additions and 801 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 5 additions & 1 deletion .circleci/config.yml
View file
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build_wallet:
macos:
xcode: "9.0"
xcode: "12.2.0"

steps:
# Checkout repo
Expand Down Expand Up @@ -40,6 +40,10 @@ jobs:
# name: update npm to latest
# command: |
# npm i npm@latest -g
- run:
name: install snyk globally
command: |
npm i snyk -g && sudo chown -R $USER:$(id -gn $USER) /Users/distiller/.config
- run:
name: install dependencies
command: |
Expand Down
Binary file modified .electrify/assets/dmgBackground.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .electrify/assets/qrl.icns
View file
Binary file not shown.
Binary file modified .electrify/assets/qrl.ico
View file
Binary file not shown.
Binary file modified .electrify/assets/qrl.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .electrify/assets/splashScreen.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion .electrify/index.js
View file
Expand Up @@ -32,7 +32,7 @@ app.on('ready', function() {
if (process.platform === 'darwin') {
app.setAboutPanelOptions({
applicationName: "QRL Wallet",
applicationVersion: "1.5.0",
applicationVersion: "1.6.5",
version: "Electron 1.8.8",
copyright: "Die QRL Stiftung, Zug Switzerland",
credits: "The QRL Developers"
Expand Down
2 changes: 1 addition & 1 deletion .electrify/loading.html
View file
Expand Up @@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>QRL Wallet - Loading</title>
</head>
<body>
<body style="background-color: #0b181e;">
<img src="loading.png" alt="QRL Wallet Loading" style="width: 800px;"/>
<script type="text/javascript">
var pageTitle = "QRL Wallet - Loading";
Expand Down
Binary file modified .electrify/loading.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions .electrify/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .electrify/package.json
View file
Expand Up @@ -2,7 +2,7 @@
"name": "QRLWallet",
"productName": "QRLWallet",
"projectName": "qrl-wallet",
"version": "1.5.0",
"version": "1.6.5",
"main": "index.js",
"dependencies": {
"electrify-qrl": "0.2.3",
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.yml
View file
Expand Up @@ -31,6 +31,7 @@ rules:
prefer-template: 0
dot-notation: 0
func-names: 0
comma-dangle: 0
prefer-arrow-callback: 0
arrow-parens: 0
import/no-extraneous-dependencies: 0
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -13,3 +13,4 @@ local.json
/.deploy
.DS_Store
.snap
/mainnet.json
7 changes: 7 additions & 0 deletions .prettierrc.js
View file
@@ -0,0 +1,7 @@
// prettier.config.js or .prettierrc.js
module.exports = {
trailingComma: "es5",
tabWidth: 2,
semi: false,
singleQuote: true,
}
20 changes: 10 additions & 10 deletions .snyk
View file
@@ -1,5 +1,5 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.14.1
version: v1.13.5
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
'npm:shelljs:20140723':
Expand All @@ -22,21 +22,21 @@ ignore:
- meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
reason: None given
expires: '2020-03-30T09:35:41.982Z'
meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
reason: None given
expires: '2020-09-28T14:57:26.056Z'
- meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
reason: None given
expires: '2020-03-30T09:35:41.982Z'
meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
reason: None given
expires: '2020-09-28T14:57:26.056Z'
- meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
reason: None given
expires: '2020-05-05T09:42:09.703Z'
- meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
reason: None given
expires: '2020-05-05T09:42:09.703Z'
- meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
reason: None given
expires: '2020-09-28T14:57:26.056Z'
- meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
reason: None given
expires: '2020-09-28T14:57:26.056Z'
'npm:plist:20180219':
- electrify-qrl > electron-packager > plist:
reason: None given
Expand All @@ -45,9 +45,6 @@ ignore:
- grpc > node-pre-gyp > mkdirp > minimist:
reason: None given
expires: '2020-05-05T09:42:09.702Z'
ledger-qrl-js > mocha > mkdirp > minimist:
reason: None given
expires: '2020-09-28T14:57:26.056Z'
- grpc > node-pre-gyp > tar > mkdirp > minimist:
reason: None given
expires: '2020-05-05T09:42:09.702Z'
Expand All @@ -60,6 +57,9 @@ ignore:
- xolvio-sync-webdriverio > webdriverio > optimist > minimist:
reason: None given
expires: '2020-05-05T09:42:09.703Z'
- ledger-qrl-js > mocha > mkdirp > minimist:
reason: None given
expires: '2020-09-28T14:57:26.056Z'
'npm:hoek:20180212':
- phantomjs-prebuilt > request > hawk > cryptiles > boom > hoek:
reason: None given
Expand Down
2 changes: 1 addition & 1 deletion client/head.html
View file
Expand Up @@ -2,5 +2,5 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>QRL Wallet</title>
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3/build/web/hack-subset.css">
<!-- <l ink rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3/build/web/hack-subset.css"> -->
</head>
6 changes: 3 additions & 3 deletions client/site/globals/site.variables.import.less
View file
Expand Up @@ -13,13 +13,13 @@
@pageFont : @fontName, 'Helvetica Neue', Arial, Helvetica, sans-serif;

@googleFontName : @fontName;
@importGoogleFonts : true;
@importGoogleFonts : false;
@googleFontSizes : '400,700,400italic,700italic';
@googleSubset : 'latin';

@googleProtocol : 'https://';
/* @googleProtocol : 'https://';
@googleFontRequest : '@{googleFontName}:@{googleFontSizes}&subset=@{googleSubset}';

*/
/*-------------------
Base Sizes
--------------------*/
Expand Down
6 changes: 3 additions & 3 deletions client/themes/default/globals/site.variables.import.less
View file
Expand Up @@ -17,13 +17,13 @@
@pageFont : @fontName, 'Helvetica Neue', Arial, Helvetica, sans-serif;

@googleFontName : @fontName;
@importGoogleFonts : true;
@importGoogleFonts : false;
@googleFontSizes : '400,700,400italic,700italic';
@googleSubset : 'latin';

@googleProtocol : 'https://';
/* @googleProtocol : 'https://';
@googleFontRequest : '@{googleFontName}:@{googleFontSizes}&subset=@{googleSubset}';

*/
/*-------------------
Base Sizes
--------------------*/
Expand Down
2 changes: 1 addition & 1 deletion devnet.json
View file
Expand Up @@ -19,5 +19,5 @@
}
]
},
"allowUnchecksummedNodes": false
"allowUnchecksummedNodes": true
}

0 comments on commit a79a33c

Please sign in to comment.