From 539dcaa85adede71146a5d654b4d25f41a8f3058 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 7 Feb 2023 12:23:25 +0100 Subject: [PATCH 1/4] Update issue template --- .github/ISSUE_TEMPLATE/bug.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 70bf9654f..56dcf5d06 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -37,14 +37,19 @@ body: id: volume-type attributes: label: Volume Type - description: What is selected under Settings → Virtual Drive? - multiple: true - options: - - FUSE - - Dokany - - WebDAV + description: What volume type is selected under Settings → Virtual Drive? + value: | + - WinFsp + - WinFsp (Local Drive) + - FUSE-T + - macFUSE + - WebDAV (Windows Explorer) + - WebDAV (AppleScript) + - WebDAV (gio) + - WebDAV (HTTP Address) + - Dokany (1.5) validations: - required: false + required: true - type: textarea id: reproduction-steps attributes: From a1379bac401d26bd92897e12a30970be71fe047f Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 22 Feb 2023 15:33:37 +0100 Subject: [PATCH 2/4] For Windows try to migrate all user settings, not only the ones of local users --- dist/win/contrib/version170-migrate-settings.ps1 | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dist/win/contrib/version170-migrate-settings.ps1 b/dist/win/contrib/version170-migrate-settings.ps1 index 11b9e29e3..8e019fe66 100644 --- a/dist/win/contrib/version170-migrate-settings.ps1 +++ b/dist/win/contrib/version170-migrate-settings.ps1 @@ -7,19 +7,9 @@ #Get all active, local user profiles $profileList = 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList' -$localUsers = Get-LocalUser | Where-Object {$_.Enabled} | ForEach-Object { $_.Name} - -Get-ChildItem $profileList | ForEach-Object { $_.GetValue("ProfileImagePath") } | Where-Object { - $profileNameMatches = ($_ | Select-String -Pattern "\\([^\\]+)$").Matches - if($profileNameMatches.Count -eq 1) { - #check if the last path part is contained in the local user name list - #otherwise do not touch it - return $localUsers.Contains($profileNameMatches[0].Groups[1].Value) - } else { - return $false; - } -} | ForEach-Object { - $settingsPath = "$_\AppData\Roaming\Cryptomator\settings.json" +Get-ChildItem $profileList | ForEach-Object { + $profilePath = $_.GetValue("ProfileImagePath") + $settingsPath = "$profilePath\AppData\Roaming\Cryptomator\settings.json" if(!(Test-Path -Path $settingsPath -PathType Leaf)) { #No settings file, nothing to do. return; From c6a9af1a0455e4e297d82258b3efcac0d27ddd63 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 1 Mar 2023 12:03:03 +0100 Subject: [PATCH 3/4] update metainfo.xml --- dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml index 9797dd6a7..eeba42263 100644 --- a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml +++ b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml @@ -66,6 +66,7 @@ + From 947eb111981bbbb088a261e98f53683a1f3c173e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 1 Mar 2023 12:06:25 +0100 Subject: [PATCH 4/4] set correct version in pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bca134d38..0bd418806 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator cryptomator - 1.7.0-SNAPSHOT + 1.7.0 Cryptomator Desktop App