mirrors
/
keeweb
mirror of https://github.com/keeweb/keeweb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop 

# Conflicts:
#	release-notes.md
pull/1777/head
antelle 2021-03-14 21:17:26 +01:00
parent 40b0643eaa 0d2107e72a
commit 879ba17760
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
6 changed files with 38232 additions and 38227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/scripts/comp/browser/theme-watcher.js
View File

@ -5,12 +5,14 @@ const ThemeWatcher = {
init() {
const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
mediaQuery.addEventListener('change', (e) => {
const dark = e.matches;
this.dark = dark;
Events.emit('dark-mode-changed', { dark });
});
this.dark = mediaQuery.matches;
if (mediaQuery && mediaQuery.addEventListener) {
mediaQuery.addEventListener('change', (e) => {
const dark = e.matches;
this.dark = dark;
Events.emit('dark-mode-changed', { dark });
});
}
this.dark = !!mediaQuery.matches;
}
};

2
app/templates/settings/settings-about.hbs
View File

@ -38,7 +38,7 @@
<h3>Desktop modules</h3>
<ul>
<li><a href="https://github.com/ranisalt/node-argon2" target="_blank">node-argon2</a><span class="muted-color">, node.js bindings for Argon2 hashing algorithm, &copy; 2015 Ranieri Althoff</span></li>
<li><a href="https://github.com/MadLittleMods/node-usb-detectoin" target="_blank">node-usb-detection</a><span class="muted-color">, list USB devices in system and detect changes on them, &copy; 2013 Kaba AG</span></li>
<li><a href="https://github.com/MadLittleMods/node-usb-detection" target="_blank">node-usb-detection</a><span class="muted-color">, list USB devices in system and detect changes on them, &copy; 2013 Kaba AG</span></li>
<li><a href="https://github.com/atom/node-keytar" target="_blank">node-keytar</a><span class="muted-color">, native password node module, &copy; 2013 GitHub Inc.</span></li>
<li><a href="https://github.com/antelle/node-yubikey-chalresp" target="_blank">node-yubikey-chalresp</a><span class="muted-color">, YubiKey challenge-response API for node.js, &copy; 2020 Antelle</span></li>
<li><a href="https://github.com/antelle/node-secure-enclave" target="_blank">node-secure-enclave</a><span class="muted-color">, Secure Enclave module for node.js and Electron, &copy; 2020 Antelle</span></li>

2
desktop/package.json
View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.17.2",
"version": "1.17.3",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "main.js",
"homepage": "https://keeweb.info",

76436
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.17.2",
"version": "1.17.3",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js",
"private": true,

3
release-notes.md
View File

@ -3,6 +3,9 @@ Release notes
##### v1.18.0 (TBD)
`-` legacy auto-type removed
##### v1.17.3 (2021-03-14)
`-` fix #1747: white screen in old Safari
##### v1.17.2 (2021-03-13)
`-` fixed crashes in the USB module on Windows
`-` fix #1745: deleting selected text in auto-type selector