Skip to content

Commit

Permalink
Merge branch 'main' into Block-Electronn-updates-if-internet-access-i…
Browse files Browse the repository at this point in the history
…s-turned-off
  • Loading branch information
Jaifroid authored Oct 27, 2024
2 parents b62b41a + 9de6212 commit 89094d5
Show file tree
Hide file tree
Showing 22 changed files with 315 additions and 199 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-electron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ env:
INPUT_VERSION: ${{ github.event.inputs.version }}
INPUT_TARGET: ${{ github.event.inputs.target }}
CRON_LAUNCHED: ${{ github.event.schedule }}
INPUT_SIGN: ${{ github.event.inputs.sign }} || 'false'
INPUT_SIGN: ${{ github.event.inputs.sign || 'false' }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ESIGNER_USERNAME: ${{ secrets.ESIGNER_USER_USERNAME }}
ESIGNER_PASSWORD: ${{ secrets.ESIGNER_USER_PASSWORD }}
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
# Changelog

## In-progress release 3.4.2
## Release 3.4.5 / 3.4.6

* ENHANCEMENT: Prevent accidental app reload if an archive is loaded
* FIX: Failure to display Wikimedia URLs ending in a question mark
* FIX: Failure to display articles from links clicked in popovers
* FIX: Remove title description from popovers in new Wikimedia ZIMs
* FIX: Remove unused scripts from Wikimedia ZIMs scraped with mobile-html API
* BUILD: Switched to new eSigner code-signing certificate
* BUILD: Disabled signing of nightly binaries due to cost
* INFO: Added info in release templates regarding SmartScreen popups on Windows
* INFO: Added info to README regarding the fact that nightly builds are unsigned
* DEV: Update Express server and dependencies

## Release 3.4.0 / 3.4.1

Expand Down
4 changes: 2 additions & 2 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1">
content="2; URL=https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.4.6">
</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.4.1">
<p><a href="https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.4.6">
Kiwix JS Electron/NWJS: releases
</a>
</p>
Expand Down
4 changes: 2 additions & 2 deletions app/nwjs.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1">
content="2; URL=https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.4.6">
</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.4.1">
<p><a href="https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.4.6">
Kiwix JS NWJS/Electron: releases
</a>
</p>
Expand Down
4 changes: 2 additions & 2 deletions app/uwp.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1">
content="2; URL=https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.4.6">
</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.4.1">
<p><a href="https://github.com/kiwix/kiwix-js-pwa/releases/tag/v3.4.6">
Kiwix JS Windows: releases
</a>
</p>
Expand Down
2 changes: 1 addition & 1 deletion package-github.appxmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" IgnorableNamespaces="uap mp uap3 uap5">
<Identity Name="Kiwix.KiwixJS" Version="3.4.2.0" Publisher="CN=Association Kiwix, O=Association Kiwix, L=Lausanne, S=Canton of Vaud, C=CH" />
<Identity Name="Kiwix.KiwixJS" Version="3.4.6.0" Publisher="CN=Association Kiwix, O=Association Kiwix, L=Lausanne, S=Canton of Vaud, C=CH" />
<mp:PhoneIdentity PhoneProductId="9983be8d-4e36-4018-bfb3-5170659bf447" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Kiwix JS</DisplayName>
Expand Down
Loading

0 comments on commit 89094d5

Please sign in to comment.