Skip to content

Commit

Permalink
Merge master into develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
nikolaglumac committed Nov 9, 2019
2 parents b749f39 + 88c6a6b commit 771a30c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Expand Up @@ -24,6 +24,12 @@ Changelog
- Fixed green Cardano theme white color and borders color ([PR 1584](https://github.com/input-output-hk/daedalus/pull/1584))
- Fixed flat button color ([PR 1586](https://github.com/input-output-hk/daedalus/pull/1586))

## 0.15.1

### Fixes

- Fixed newsfeed content loading issue ([PR 1653](https://github.com/input-output-hk/daedalus/pull/1653))

## 0.15.0

### Features
Expand Down
14 changes: 7 additions & 7 deletions installers/cardano-configuration.yaml
Expand Up @@ -14851,7 +14851,7 @@ mainnet_wallet_win64: &mainnet_wallet_win64
<<: *mainnet_full
update:
applicationName: csl-daedalus
applicationVersion: 16
applicationVersion: 17
lastKnownBlockVersion:
bvMajor: 0
bvMinor: 1
Expand All @@ -14861,7 +14861,7 @@ mainnet_wallet_macos64: &mainnet_wallet_macos64
<<: *mainnet_full
update:
applicationName: csl-daedalus
applicationVersion: 16
applicationVersion: 17
lastKnownBlockVersion:
bvMajor: 0
bvMinor: 1
Expand All @@ -14871,7 +14871,7 @@ mainnet_wallet_linux64: &mainnet_wallet_linux64
<<: *mainnet_full
update:
applicationName: csl-daedalus
applicationVersion: 16
applicationVersion: 17
lastKnownBlockVersion:
bvMajor: 0
bvMinor: 1
Expand Down Expand Up @@ -14945,7 +14945,7 @@ testnet_wallet: &testnet_wallet
<<: *testnet_full
update: &testnet_wallet_update
applicationName: csl-daedalus
applicationVersion: 5
applicationVersion: 6
lastKnownBlockVersion:
bvMajor: 0
bvMinor: 0
Expand Down Expand Up @@ -15141,7 +15141,7 @@ mainnet_dryrun_wallet_win64: &mainnet_dryrun_wallet_win64
<<: *mainnet_dryrun_full
update:
applicationName: csl-daedalus
applicationVersion: 28
applicationVersion: 29
lastKnownBlockVersion:
bvMajor: 1
bvMinor: 0
Expand All @@ -15151,7 +15151,7 @@ mainnet_dryrun_wallet_macos64: &mainnet_dryrun_wallet_macos64
<<: *mainnet_dryrun_full
update:
applicationName: csl-daedalus
applicationVersion: 28
applicationVersion: 29
lastKnownBlockVersion:
bvMajor: 1
bvMinor: 0
Expand All @@ -15161,7 +15161,7 @@ mainnet_dryrun_wallet_linux64: &mainnet_dryrun_wallet_linux64
<<: *mainnet_dryrun_full
update:
applicationName: csl-daedalus
applicationVersion: 28
applicationVersion: 29
lastKnownBlockVersion:
bvMajor: 1
bvMinor: 0
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{
"name": "daedalus",
"productName": "Daedalus",
"version": "0.15.0",
"version": "0.15.1",
"description": "Cryptocurrency Wallet",
"main": "./dist/main/index.js",
"scripts": {
Expand Down
1 change: 1 addition & 0 deletions source/renderer/app/api/utils/externalRequest.js
Expand Up @@ -29,6 +29,7 @@ export const externalRequest = (
const request = requestMethod(options);

request.on('response', response => {
response.setEncoding('utf8');
let body = '';
response.on('data', chunk => {
body += chunk;
Expand Down

0 comments on commit 771a30c

Please sign in to comment.