diff --git a/CHANGELOG.md b/CHANGELOG.md index a61a78fddcb..b20c6bf2e94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv - We enabled creating a new file link manually. [#11017](https://github.com/JabRef/jabref/issues/11017) - We added a toggle button to invert the selected groups. [#9073](https://github.com/JabRef/jabref/issues/9073) - We reintroduced the floating search in the main table. [#4237](https://github.com/JabRef/jabref/issues/4237) +- We added a switch not to store the linked file URL, because it caused troubles at other apps. [#11735](https://github.com/JabRef/jabref/pull/11735) - When starting a new SLR, the selected catalogs now persist within and across JabRef sessions. [koppor#614](https://github.com/koppor/jabref/issues/614) - We added a different background color to the search bar to indicate when the search syntax is wrong. [#11658](https://github.com/JabRef/jabref/pull/11658) diff --git a/build.gradle b/build.gradle index b365a899529..abcd0eec189 100644 --- a/build.gradle +++ b/build.gradle @@ -238,7 +238,7 @@ dependencies { } implementation 'org.fxmisc.flowless:flowless:0.7.3' implementation 'org.fxmisc.richtext:richtextfx:0.11.3' - implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '2.43.0') { + implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '2.48.0') { exclude module: 'javax.inject' // Split package, use only jakarta.inject exclude module: 'commons-lang3' exclude group: 'org.apache.commons.validator' @@ -325,7 +325,7 @@ dependencies { implementation 'com.github.vatbub:mslinks:1.0.6.2' // YAML formatting - implementation 'org.yaml:snakeyaml:2.2' + implementation 'org.yaml:snakeyaml:2.3' // AI implementation 'dev.langchain4j:langchain4j:0.34.0' @@ -339,7 +339,7 @@ dependencies { implementation 'ai.djl:api:0.29.0' implementation 'ai.djl.pytorch:pytorch-model-zoo:0.29.0' implementation 'ai.djl.huggingface:tokenizers:0.29.0' - implementation 'io.github.stefanbratanov:jvm-openai:0.10.0' + implementation 'io.github.stefanbratanov:jvm-openai:0.11.0' // openai depends on okhttp, which needs kotlin - see https://github.com/square/okhttp/issues/5299 for details implementation ('com.squareup.okhttp3:okhttp:4.12.0') { exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8' @@ -370,7 +370,7 @@ dependencies { xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2' xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2' - rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.17.0")) + rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.18.0")) rewrite("org.openrewrite.recipe:rewrite-static-analysis") rewrite("org.openrewrite.recipe:rewrite-logging-frameworks") rewrite("org.openrewrite.recipe:rewrite-testing-frameworks") diff --git a/buildres/abbrv.jabref.org b/buildres/abbrv.jabref.org index b69f1d607a5..234cce883ad 160000 --- a/buildres/abbrv.jabref.org +++ b/buildres/abbrv.jabref.org @@ -1 +1 @@ -Subproject commit b69f1d607a57488276f3402bbf610d9129e7f6fb +Subproject commit 234cce883adf9012c2831990d883b198d1d6a939 diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java index 490da28bdca..ea434197f9c 100644 --- a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java +++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java @@ -169,9 +169,9 @@ private void onSuccess(Path targetDirectory, Path downloadedFile) { if (newLinkedFile.getDescription().isEmpty() && !linkedFile.getDescription().isEmpty()) { newLinkedFile.setDescription((linkedFile.getDescription())); } - if (linkedFile.getSourceUrl().isEmpty() && LinkedFile.isOnlineLink(linkedFile.getLink())) { + if (linkedFile.getSourceUrl().isEmpty() && LinkedFile.isOnlineLink(linkedFile.getLink()) && filePreferences.shouldKeepDownloadUrl()) { newLinkedFile.setSourceURL(linkedFile.getLink()); - } else { + } else if (filePreferences.shouldKeepDownloadUrl()) { newLinkedFile.setSourceURL(linkedFile.getSourceUrl()); } diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java index 4eb29ff872f..cff14afe648 100644 --- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java +++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java @@ -41,7 +41,6 @@ import org.jabref.gui.util.BackgroundTask; import org.jabref.gui.util.DirectoryDialogConfiguration; import org.jabref.gui.util.TaskExecutor; -import org.jabref.logic.ai.AiService; import org.jabref.logic.citationkeypattern.CitationKeyGenerator; import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences; import org.jabref.logic.citationstyle.CitationStyle; @@ -95,7 +94,6 @@ public class OpenOfficePanel { private final VBox vbox = new VBox(); private final PreferencesService preferencesService; - private final AiService aiService; private final StateManager stateManager; private final ClipBoardManager clipBoardManager; private final UndoManager undoManager; @@ -109,7 +107,6 @@ public class OpenOfficePanel { public OpenOfficePanel(LibraryTabContainer tabContainer, PreferencesService preferencesService, - AiService aiService, KeyBindingRepository keyBindingRepository, JournalAbbreviationRepository abbreviationRepository, TaskExecutor taskExecutor, @@ -123,7 +120,6 @@ public OpenOfficePanel(LibraryTabContainer tabContainer, this.fileUpdateMonitor = fileUpdateMonitor; this.entryTypesManager = entryTypesManager; this.preferencesService = preferencesService; - this.aiService = aiService; this.taskExecutor = taskExecutor; this.dialogService = dialogService; this.stateManager = stateManager; diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml index 57cd5a4a449..463debd9327 100644 --- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml @@ -20,6 +20,7 @@ +