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 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 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 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 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 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/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 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"