mirror of
https://github.com/kiwix/kiwix-js-pwa.git
synced 2025-09-12 22:09:43 -04:00
Merge branch 'main' into feat-708-jainex
This commit is contained in:
jainex
GitHub
commit
32ebe0c71e
@ -65,7 +65,7 @@
|
||||
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
|
||||
<AppxBundle>Always</AppxBundle>
|
||||
<AppxBundlePlatforms>neutral</AppxBundlePlatforms>
|
||||
<PackageCertificateThumbprint>82B88B62A6F87FBA62B2C933D747E52EDBF0F7F6</PackageCertificateThumbprint>
|
||||
<PackageCertificateThumbprint>e33d961d35fb3161f7db607342868bb51ae05de3</PackageCertificateThumbprint>
|
||||
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
|
||||
<AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
|
||||
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting to latest Kiwix JS Electron and NWJS release</title>
|
||||
<meta http-equiv="refresh"
|
||||
content="2; URL=https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.6">
|
||||
content="2; URL=https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.8">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div style="max-width: 1240px; margin: 3em auto">
|
||||
<h1>Redirecting to latest Kiwix JS Electron and NWJS release...</h1>
|
||||
<p>If your browser does not automatically redirect, please click on:</p>
|
||||
<p><a href="https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.6">
|
||||
<p><a href="https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.8">
|
||||
Kiwix JS Electron/NWJS: releases
|
||||
</a>
|
||||
</p>
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting to latest Kiwix JS NWJS and Electron release</title>
|
||||
<meta http-equiv="refresh"
|
||||
content="2; URL=https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.6">
|
||||
content="2; URL=https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.8">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div style="max-width: 1240px; margin: 3em auto">
|
||||
<h1>Redirecting to latest Kiwix JS NWJS and Electron release...</h1>
|
||||
<p>If your browser does not automatically redirect, please click on:</p>
|
||||
<p><a href="https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.6">
|
||||
<p><a href="https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.8">
|
||||
Kiwix JS NWJS/Electron: releases
|
||||
</a>
|
||||
</p>
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting to latest Kiwix JS Windows UWP release</title>
|
||||
<meta http-equiv="refresh"
|
||||
content="2; URL=https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.6">
|
||||
content="2; URL=https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.8">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div style="max-width: 1240px; margin: 3em auto">
|
||||
<h1>Redirecting to latest Kiwix JS Windows UWP release...</h1>
|
||||
<p>If your browser does not automatically redirect, please click on:</p>
|
||||
<p><a href="https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.6">
|
||||
<p><a href="https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.6.8">
|
||||
Kiwix JS Windows: releases
|
||||
</a>
|
||||
</p>
|
||||
|
||||
4990
package-lock.json
generated
4990
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
18
package.json
18
package.json
@ -13,11 +13,13 @@
|
||||
"buildResources": "../electron_icons"
|
||||
},
|
||||
"win": {
|
||||
"certificateSha1": "82B88B62A6F87FBA62B2C933D747E52EDBF0F7F6",
|
||||
"signingHashAlgorithms": [
|
||||
"sha256"
|
||||
],
|
||||
"rfc3161TimeStampServer": "http://ts.ssl.com",
|
||||
"signtoolOptions": {
|
||||
"certificateSha1": "e33d961d35fb3161f7db607342868bb51ae05de3",
|
||||
"signingHashAlgorithms": [
|
||||
"sha256"
|
||||
],
|
||||
"rfc3161TimeStampServer": "http://ts.ssl.com"
|
||||
},
|
||||
"asar": "true",
|
||||
"extraResources": {
|
||||
"from": "archives",
|
||||
@ -166,8 +168,8 @@
|
||||
"@vitejs/plugin-legacy": "^6.0.2",
|
||||
"babel-plugin-polyfill-corejs3": "^0.7.1",
|
||||
"del-cli": "^5.0.0",
|
||||
"electron": "29.3.3",
|
||||
"electron-builder": "^24.13.3",
|
||||
"electron": "29.3.1",
|
||||
"electron-builder": "^26.0.18",
|
||||
"eslint": "^8.42.0",
|
||||
"eslint-config-standard": "^17.1.0",
|
||||
"eslint-plugin-import": "^2.27.5",
|
||||
@ -182,7 +184,7 @@
|
||||
"core-js": "3.30.2",
|
||||
"electron-context-menu": "^3.1.1",
|
||||
"electron-store": "^8.1.0",
|
||||
"electron-updater": "^6.2.1",
|
||||
"electron-updater": "^6.6.7",
|
||||
"express": "^4.21.0",
|
||||
"jquery": "^3.7.1"
|
||||
}
|
||||
|
||||
@ -1260,7 +1260,7 @@
|
||||
<div class="row">
|
||||
<h4 class="panel-group-heading">Expert settings</h4>
|
||||
<div class="panel panel-warning" id="defaultBehaviourssDiv">
|
||||
<div class="panel-heading">Modify default behavours</div>
|
||||
<div class="panel-heading">Modify default behaviours</div>
|
||||
<div class="panel-body">
|
||||
<div class="column">
|
||||
<label class="checkbox" title="In some contexts, reloading the app will disconnect the currently loaded ZIM archive, requiring you to re-pick it. You may disable default interception here.">
|
||||
|
||||
@ -3736,8 +3736,12 @@ function setLocalArchiveFromArchiveList (archive) {
|
||||
console.error(err);
|
||||
});
|
||||
} else {
|
||||
uiUtil.systemAlert('We could not find the location of the file ' + archive +
|
||||
'. This can happen if you dragged and dropped a file into the app. Please use the file or folder pickers instead.');
|
||||
// If we are here, it means that the user has not selected a file or folder
|
||||
// or else that a user gesture is needed to access the file system (this happens with recent versions of Electron)
|
||||
if (!window.fs) {
|
||||
uiUtil.systemAlert('We could not find the location of the file ' + archive +
|
||||
'. This can happen if you dragged and dropped a file into the app. Please use the file or folder pickers instead.');
|
||||
}
|
||||
if (document.getElementById('configuration').style.display === 'none') {
|
||||
document.getElementById('btnConfigure').click();
|
||||
}
|
||||
@ -4511,7 +4515,7 @@ function archiveReadyCallback (archive) {
|
||||
// Check if source of the zim file can be trusted and that it is not a packaged archive
|
||||
if (!settingsStore.getItem('trustedZimFiles').includes(archive.file.name) && archive.file._files[0].name !== params.packagedFile &&
|
||||
// And it's not an Electron-accessed file inside the app's package
|
||||
!(window.electronAPI && archive.file._files[0].path.indexOf(electronAPI.__dirname.replace(/[\\/]+(?:app\.asar)?$/, '') + '/' + params.archivePath) === 0)) {
|
||||
!(window.electronAPI && archive.file._files[0].path && archive.file._files[0].path.indexOf(electronAPI.__dirname.replace(/[\\/]+(?:app\.asar)?$/, '') + '/' + params.archivePath) === 0)) {
|
||||
verifyLoadedArchive(archive).then(function () {
|
||||
displayArchive();
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user