From 44db97327de8215d9ea89c2fdcdf42be38777185 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Wed, 16 Dec 2020 09:06:11 +0100 Subject: [PATCH 01/45] Update feature.md --- .github/ISSUE_TEMPLATE/feature.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md index 869d4d4b9..513937e58 100644 --- a/.github/ISSUE_TEMPLATE/feature.md +++ b/.github/ISSUE_TEMPLATE/feature.md @@ -11,7 +11,7 @@ We're happy to help you via our support channels! Please read: https://github.co By filing a feature request, you are expected to comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md -Of course, we also expect you to search for existing similar feature requests first! ;) +Of course, we also expect you to search for existing similar issues first! ;) https://github.com/cryptomator/cryptomator/issues?q= --> @@ -29,4 +29,4 @@ Of course, we also expect you to search for existing similar feature requests fi ### Additional Context -[Add any other context or screenshots about the feature request here.] \ No newline at end of file +[Add any other context or screenshots about the feature request here.] From 96c8c9a9a96dbb1697d2e95fff51fab217911d42 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Wed, 16 Dec 2020 09:07:39 +0100 Subject: [PATCH 02/45] Update bug.md --- .github/ISSUE_TEMPLATE/bug.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 528dd76ad..6e9a38af5 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -6,10 +6,9 @@ labels: type:bug @@ -61,7 +57,6 @@ Of course, we also expect you to search for existing similar issues first! ;) ht [Any additional information, log files, screenshots, configuration, or data that might be necessary to reproduce the issue.] From ce4ec16c627a7e0ab85d190074c9f476ca5696b9 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 16 Dec 2020 12:16:32 +0100 Subject: [PATCH 03/45] Update bug.md Add info to also specify desktop environment on Linux systems in section system setup --- .github/ISSUE_TEMPLATE/bug.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 6e9a38af5..e84e6a63c 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -30,7 +30,7 @@ Of course, we also expect you to search for existing similar issues first! ;) ht ### System Setup -* Operating system and version: [Windows/macOS/Linux + Version] +* Operating system and version: [Windows/macOS/Linux + Version ( + Desktop Environment, if Linux)] * Cryptomator version: [Shown in the settings] * Volume type: [Dokany/FUSE/WebDAV, shown in the settings] From 046acb9bbfee425d95c304c97db77c97bae38f5c Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 16 Dec 2020 13:33:50 +0100 Subject: [PATCH 04/45] mark fuse.experimental deprecated [ci skip] --- .../src/main/java/org/cryptomator/common/Environment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/main/commons/src/main/java/org/cryptomator/common/Environment.java b/main/commons/src/main/java/org/cryptomator/common/Environment.java index d920b1b9f..5d64b3856 100644 --- a/main/commons/src/main/java/org/cryptomator/common/Environment.java +++ b/main/commons/src/main/java/org/cryptomator/common/Environment.java @@ -75,6 +75,7 @@ public class Environment { return getInt("cryptomator.minPwLength", DEFAULT_MIN_PW_LENGTH); } + @Deprecated // TODO: remove as soon as custom mount path works properly on Win+Fuse public boolean useExperimentalFuse() { return Boolean.getBoolean("fuse.experimental"); } From 96bb97d50aad9e4b861003a11c591a551491cca5 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 16 Dec 2020 13:48:33 +0100 Subject: [PATCH 05/45] Added new setting `showTrayIcon` defaulting to new environment property `cryptomator.showTrayIcon` --- .idea/runConfigurations/Cryptomator_Linux.xml | 2 +- .../runConfigurations/Cryptomator_Linux_Dev.xml | 2 +- .idea/runConfigurations/Cryptomator_Windows.xml | 2 +- .../Cryptomator_Windows_Dev.xml | 2 +- .idea/runConfigurations/Cryptomator_macOS.xml | 2 +- .../runConfigurations/Cryptomator_macOS_Dev.xml | 2 +- .../org/cryptomator/common/Environment.java | 17 +++++++++++++---- .../cryptomator/common/settings/Settings.java | 11 ++++++++++- .../common/settings/SettingsJsonAdapter.java | 15 +++++++++++++-- .../common/settings/SettingsProvider.java | 7 ++++--- .../org/cryptomator/common/EnvironmentTest.java | 11 ++++------- .../settings/SettingsJsonAdapterTest.java | 5 ++++- .../common/settings/SettingsTest.java | 5 ++++- 13 files changed, 58 insertions(+), 25 deletions(-) diff --git a/.idea/runConfigurations/Cryptomator_Linux.xml b/.idea/runConfigurations/Cryptomator_Linux.xml index ab7f0ca6e..01c00da09 100644 --- a/.idea/runConfigurations/Cryptomator_Linux.xml +++ b/.idea/runConfigurations/Cryptomator_Linux.xml @@ -2,7 +2,7 @@