From d9d8c84230fbcb1e242612fae9054ada58dd6c74 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 26 Jun 2024 13:23:38 +0200 Subject: [PATCH 1/7] adjust formatting of metainfo file --- dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml index 4f6981e62..e2a51ae88 100644 --- a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml +++ b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml @@ -68,7 +68,6 @@ Skymatic GmbH - mild From d6fd012f7163d867212163784df312b6e373aa44 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 26 Jun 2024 13:28:37 +0200 Subject: [PATCH 2/7] fix av whitelisting step in win-exe workflow --- .github/workflows/win-exe.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 18c50db4b..8611c5b3e 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -390,12 +390,14 @@ jobs: needs: [publish] with: url: ${{ needs.publish.outputs.download-url-msi }} + secrets: inherit allowlist-exe: uses: ./.github/workflows/av-whitelist.yml needs: [publish] with: url: ${{ needs.publish.outputs.download-url-exe }} + secrets: inherit notify-winget: name: Notify for winget-release From 59a2398c4c9b506ab63b9d61e283dc18267a822a Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Thu, 4 Jul 2024 11:49:37 +0200 Subject: [PATCH 3/7] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 2b0a78336..ecbd11165 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,6 @@ Cryptomator is provided free of charge as an open-source project despite the hig Mow Capital - EaseUS Hassmann IT-Forensik From 70e52b1a3186316447be755c816c6db75e32d6d1 Mon Sep 17 00:00:00 2001 From: Ralph Plawetzki Date: Sun, 7 Jul 2024 15:41:28 +0200 Subject: [PATCH 4/7] Fix typo Closes #3480 --- dist/linux/appimage/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index e0af3999a..91432ec4b 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -32,7 +32,7 @@ if [ "${CPU_ARCH}" = "aarch64" ]; then fi # download javaFX jmods -JAVAFX_JMODS_URL="https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-21.0.1_linux-${JAVAFX_ARCH}_bin-jmods.zip" +JAVAFX_JMODS_URL="https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_linux-${JAVAFX_ARCH}_bin-jmods.zip" curl -L ${JAVAFX_JMODS_URL} -o openjfx-jmods.zip From b4f9bc62cae7d75640c876b75983925195033779 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 07:52:56 +0000 Subject: [PATCH 5/7] Bump the maven-build-plugins group across 1 directory with 3 updates (#3484) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6fb45d9d7..96cf25861 100644 --- a/pom.xml +++ b/pom.xml @@ -62,15 +62,15 @@ 24.1.0 - 9.2.0 + 10.0.2 0.8.12 2.4.0 1.2.1 3.13.0 3.3.1 - 3.7.0 + 3.7.1 3.3.0 - 3.4.1 + 3.4.2 From cb054bb4f5c0966abb16badd87c1a553eb0f501f Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Tue, 9 Jul 2024 13:46:41 +0200 Subject: [PATCH 6/7] fix update available check in preference tab selection --- .../org/cryptomator/ui/preferences/PreferencesController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java index 0937fccd9..ad3d08491 100644 --- a/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java @@ -37,7 +37,7 @@ public class PreferencesController implements FxController { this.env = env; this.window = window; this.selectedTabProperty = selectedTabProperty; - this.updateAvailable = updateChecker.latestVersionProperty().isNotNull(); + this.updateAvailable = updateChecker.updateAvailableProperty(); } @FXML From 5f5b5a5426be9875bc29b7eadaea6fc82f06b2ad Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Tue, 9 Jul 2024 13:48:45 +0200 Subject: [PATCH 7/7] set preferences window min width and height --- .../org/cryptomator/ui/preferences/PreferencesComponent.java | 2 ++ src/main/resources/fxml/preferences.fxml | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java b/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java index 8dcb11fd8..2d569970d 100644 --- a/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java +++ b/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java @@ -30,6 +30,8 @@ public interface PreferencesComponent { selectedTabProperty().set(selectedTab); Stage stage = window(); stage.setScene(scene().get()); + stage.setMinWidth(420); + stage.setMinHeight(300); stage.show(); stage.requestFocus(); return stage; diff --git a/src/main/resources/fxml/preferences.fxml b/src/main/resources/fxml/preferences.fxml index c96eb5395..b516616c1 100644 --- a/src/main/resources/fxml/preferences.fxml +++ b/src/main/resources/fxml/preferences.fxml @@ -7,8 +7,6 @@ xmlns="http://javafx.com/javafx" fx:id="tabPane" fx:controller="org.cryptomator.ui.preferences.PreferencesController" - minWidth="-Infinity" - maxWidth="-Infinity" prefWidth="650" tabMinWidth="60" tabClosingPolicy="UNAVAILABLE"