mirror of
https://github.com/balena-io/etcher.git
synced 2025-04-26 00:07:17 +00:00
Merge branch 'master' into update-issue-template
This commit is contained in:
commit
3ab6749f49
@ -1,3 +1,13 @@
|
|||||||
|
- commits:
|
||||||
|
- subject: "patch: fix flashing from URL when using basic auth"
|
||||||
|
hash: a6f6cd4a19b25c26cbc36386719186a7e3c31fea
|
||||||
|
body: ""
|
||||||
|
footer: {}
|
||||||
|
author: Marco Füllemann
|
||||||
|
nested: []
|
||||||
|
version: 1.7.5
|
||||||
|
title: "'patch: fix flashing from URL when using basic auth'"
|
||||||
|
date: 2022-02-21T12:39:38.276Z
|
||||||
- commits:
|
- commits:
|
||||||
- subject: "patch: set version update notification 1.7.3"
|
- subject: "patch: set version update notification 1.7.3"
|
||||||
hash: 28adc34239f9abc7ccfe13f2810991ca0f17a645
|
hash: 28adc34239f9abc7ccfe13f2810991ca0f17a645
|
||||||
|
@ -3,6 +3,11 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
This project adheres to [Semantic Versioning](http://semver.org/).
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
|
|
||||||
|
# v1.7.5
|
||||||
|
## (2022-02-21)
|
||||||
|
|
||||||
|
* patch: fix flashing from URL when using basic auth [Marco Füllemann]
|
||||||
|
|
||||||
# v1.7.4
|
# v1.7.4
|
||||||
## (2022-02-21)
|
## (2022-02-21)
|
||||||
|
|
||||||
|
@ -315,6 +315,7 @@ export interface SourceMetadata extends sourceDestination.Metadata {
|
|||||||
drive?: DrivelistDrive;
|
drive?: DrivelistDrive;
|
||||||
extension?: string;
|
extension?: string;
|
||||||
archiveExtension?: string;
|
archiveExtension?: string;
|
||||||
|
auth?: Authentication;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface SourceSelectorProps {
|
interface SourceSelectorProps {
|
||||||
@ -529,6 +530,7 @@ export class SourceSelector extends React.Component<
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (metadata !== undefined) {
|
if (metadata !== undefined) {
|
||||||
|
metadata.auth = auth;
|
||||||
selectionState.selectSource(metadata);
|
selectionState.selectSource(metadata);
|
||||||
analytics.logEvent('Select image', {
|
analytics.logEvent('Select image', {
|
||||||
// An easy way so we can quickly identify if we're making use of
|
// An easy way so we can quickly identify if we're making use of
|
||||||
|
@ -291,9 +291,14 @@ ipc.connectTo(IPC_SERVER_ID, () => {
|
|||||||
url: imagePathObject.url,
|
url: imagePathObject.url,
|
||||||
avoidRandomAccess: true,
|
avoidRandomAccess: true,
|
||||||
axiosInstance: axios.create(_.omit(imagePathObject, ['url'])),
|
axiosInstance: axios.create(_.omit(imagePathObject, ['url'])),
|
||||||
|
auth: options.image.auth,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
source = new Http({ url: imagePath, avoidRandomAccess: true });
|
source = new Http({
|
||||||
|
url: imagePath,
|
||||||
|
avoidRandomAccess: true,
|
||||||
|
auth: options.image.auth,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "balena-etcher",
|
"name": "balena-etcher",
|
||||||
"version": "1.7.4",
|
"version": "1.7.5",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"name": "balena-etcher",
|
"name": "balena-etcher",
|
||||||
"private": true,
|
"private": true,
|
||||||
"displayName": "balenaEtcher",
|
"displayName": "balenaEtcher",
|
||||||
"version": "1.7.4",
|
"version": "1.7.5",
|
||||||
"packageType": "local",
|
"packageType": "local",
|
||||||
"main": "generated/etcher.js",
|
"main": "generated/etcher.js",
|
||||||
"description": "Flash OS images to SD cards and USB drives, safely and easily.",
|
"description": "Flash OS images to SD cards and USB drives, safely and easily.",
|
||||||
@ -116,6 +116,6 @@
|
|||||||
"webpack-dev-server": "4.5.0"
|
"webpack-dev-server": "4.5.0"
|
||||||
},
|
},
|
||||||
"versionist": {
|
"versionist": {
|
||||||
"publishedAt": "2022-02-21T08:33:45.910Z"
|
"publishedAt": "2022-02-21T12:39:38.813Z"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user