diff --git a/App/AppInfo/appinfo.ini b/App/AppInfo/appinfo.ini index e9184df..30217d5 100644 --- a/App/AppInfo/appinfo.ini +++ b/App/AppInfo/appinfo.ini @@ -18,8 +18,8 @@ Freeware=true CommercialUse=true [Version] -PackageVersion=6.0.20.0 -DisplayVersion=6.0.20 +PackageVersion=6.0.22.0 +DisplayVersion=6.0.22 [Control] Icons=1 diff --git a/App/Zotero/application.ini b/App/Zotero/application.ini index df97f65..29a04d7 100644 --- a/App/Zotero/application.ini +++ b/App/Zotero/application.ini @@ -1,8 +1,8 @@ [App] Vendor=Zotero Name=Zotero -Version=6.0.20 -BuildID=20230114013617 +Version=6.0.22 +BuildID=20230222222410 Copyright=Copyright (c) 2006-2018 Contributors ID=zotero@chnm.gmu.edu diff --git a/App/Zotero/components/zotero-service.js b/App/Zotero/components/zotero-service.js index 42d5937..8725ed4 100644 --- a/App/Zotero/components/zotero-service.js +++ b/App/Zotero/components/zotero-service.js @@ -532,16 +532,6 @@ ZoteroCommandLineHandler.prototype = { zContext.Zotero.Integration.execCommand(agent, command, docId, templateVersion); } - // handler for Windows IPC commands - var ipcParam = cmdLine.handleFlagWithParam("ZoteroIPC", false); - if (ipcParam) { - // Don't open a new window - cmdLine.preventDefault = true; - if (!zContext) new ZoteroService(); - let Zotero = zContext.Zotero; - Zotero.setTimeout(() => Zotero.IPC.parsePipeInput(ipcParam), 0); - } - if (isStandalone()) { var fileToOpen; // Special handler for "zotero" URIs at the command line to prevent them from opening a new window diff --git a/App/Zotero/defaults/preferences/zotero.js b/App/Zotero/defaults/preferences/zotero.js index 5e0e551..52429a2 100644 --- a/App/Zotero/defaults/preferences/zotero.js +++ b/App/Zotero/defaults/preferences/zotero.js @@ -210,4 +210,7 @@ pref("extensions.zotero.annotations.noteTemplates.highlight", "

{{highlight}} pref("extensions.zotero.annotations.noteTemplates.note", "

{{citation}} {{comment}}

"); // Scaffold -pref("extensions.zotero.scaffold.eslint.enabled", true); \ No newline at end of file +pref("extensions.zotero.scaffold.eslint.enabled", true); + +// Tabs +pref("extensions.zotero.tabs.title.reader", "titleCreatorYear"); \ No newline at end of file diff --git a/App/Zotero/extensions/zoteroOpenOfficeIntegration@zotero.org/chrome/install.js b/App/Zotero/extensions/zoteroOpenOfficeIntegration@zotero.org/chrome/install.js index 7a47d47..caf6434 100644 --- a/App/Zotero/extensions/zoteroOpenOfficeIntegration@zotero.org/chrome/install.js +++ b/App/Zotero/extensions/zoteroOpenOfficeIntegration@zotero.org/chrome/install.js @@ -177,7 +177,7 @@ async function checkMacJDK() { */ function checkJRE() { var isInstalled = false, - keys = ['Java Runtime Environment', 'JRE'], + keys = ['Java Runtime Environment', 'JRE', 'JDK'], wrk = Components.classes["@mozilla.org/windows-registry-key;1"] .createInstance(Components.interfaces.nsIWindowsRegKey); diff --git a/App/Zotero/extensions/zoteroOpenOfficeIntegration@zotero.org/install.rdf b/App/Zotero/extensions/zoteroOpenOfficeIntegration@zotero.org/install.rdf index e64cfd8..7a8ef33 100644 --- a/App/Zotero/extensions/zoteroOpenOfficeIntegration@zotero.org/install.rdf +++ b/App/Zotero/extensions/zoteroOpenOfficeIntegration@zotero.org/install.rdf @@ -4,7 +4,7 @@ zoteroOpenOfficeIntegration@zotero.org Zotero LibreOffice Integration - 6.0.3.SA.6.0.20 + 6.0.4.SA.6.0.22 Zotero Simon Kornblith https://www.zotero.org diff --git a/App/Zotero/extensions/zoteroWinWordIntegration@zotero.org/install.rdf b/App/Zotero/extensions/zoteroWinWordIntegration@zotero.org/install.rdf index 05d5076..8225a93 100644 --- a/App/Zotero/extensions/zoteroWinWordIntegration@zotero.org/install.rdf +++ b/App/Zotero/extensions/zoteroWinWordIntegration@zotero.org/install.rdf @@ -4,7 +4,7 @@ zoteroWinWordIntegration@zotero.org Zotero Word for Windows Integration - 6.0.2.SA.6.0.20 + 6.0.2.SA.6.0.22 Zotero Simon Kornblith https://www.zotero.org diff --git a/App/Zotero/pdfinfo.exe b/App/Zotero/pdfinfo.exe index 3138de6..389cd2d 100644 Binary files a/App/Zotero/pdfinfo.exe and b/App/Zotero/pdfinfo.exe differ diff --git a/App/Zotero/pdftotext.exe b/App/Zotero/pdftotext.exe index 2c6be96..057a20f 100644 Binary files a/App/Zotero/pdftotext.exe and b/App/Zotero/pdftotext.exe differ diff --git a/App/Zotero/uninstall/helper.exe b/App/Zotero/uninstall/helper.exe index c71033a..9e82ce9 100644 Binary files a/App/Zotero/uninstall/helper.exe and b/App/Zotero/uninstall/helper.exe differ diff --git a/App/Zotero/updater.exe b/App/Zotero/updater.exe index 4d86849..0a67305 100644 Binary files a/App/Zotero/updater.exe and b/App/Zotero/updater.exe differ diff --git a/App/Zotero/zotero.exe b/App/Zotero/zotero.exe index 978175b..c3a19b6 100644 Binary files a/App/Zotero/zotero.exe and b/App/Zotero/zotero.exe differ diff --git a/App/Zotero/zotero.jar b/App/Zotero/zotero.jar index aa9419b..1c4f9b0 100644 Binary files a/App/Zotero/zotero.jar and b/App/Zotero/zotero.jar differ diff --git a/changelog.fr.md b/changelog.fr.md index 16e925a..7c26309 100644 --- a/changelog.fr.md +++ b/changelog.fr.md @@ -1,5 +1,7 @@ Historique des versions : ---- +- 2023-02-27. Mise à jour vers Zotero 6.0.22. + - 2023-01-15. Mise à jour vers Zotero 6.0.20. - 2023-01-02. Mise à jour vers Zotero 6.0.19. diff --git a/changelog.md b/changelog.md index 1afb4d1..3dbf3bf 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ Versions history: ---- +- 2023-02-27. Update to Zotero 6.0.22. + - 2023-01-02. Update to Zotero 6.0.20. - 2023-01-02. Update to Zotero 6.0.19.