mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-18 16:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,138 Commits 29 Branches 213 Tags
a30db34c1994e94de85f8e8fc59166add04424d3
Commit Graph

5138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Schrenk
1a153e1f6e Merge branch 'develop' into libappindicator 2023-07-26 14:18:42 +02:00
Armin Schrenk
b0a7c23055 correct comment 2023-07-26 14:16:07 +02:00
Armin Schrenk
27ca6591ea Apply suggestions from code review 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2023-07-26 13:01:14 +02:00
Armin Schrenk
ad3d36e06a check sha256 sum of downloaded artifact in ci 2023-07-26 11:37:05 +02:00
Armin Schrenk
83e91d361f fix errors in build script 2023-07-25 17:29:34 +02:00
JaniruTEC
221b4e85bc Merge pull request #2996 from cryptomator/feature/2856-folder-mounts-win 
Improve handling of folder-mounts on Win
 2023-07-25 15:51:18 +02:00
JaniruTEC
b536bd3e09 Applied suggestions from code review 
Added exception to method signature
Renamed enum constant

See:
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273497818
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273499227
 2023-07-25 15:33:16 +02:00
Armin Schrenk
b73993c375 add jfx to module path 2023-07-25 14:43:29 +02:00
JaniruTEC
ae392b4014 Refactored "handleMountPointFolder" (now: "getMountPointState") 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273277804
 2023-07-25 13:34:39 +02:00
JaniruTEC
1c34402c87 Applied minor corrections 
See:
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273277251
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273280687
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273287847
 2023-07-25 13:17:21 +02:00
Armin Schrenk
a415e3b0a9 update local build script to download jfx jmods 2023-07-25 13:08:19 +02:00
Armin Schrenk
e41a33d250 fixes #3030 2023-07-25 13:07:40 +02:00
JaniruTEC
587cff9518 Added more tests 2023-07-24 19:22:47 +02:00
JaniruTEC
ea8e850aa9 Moved check for dir/emptiness to "handleMountPointFolder" 2023-07-24 19:15:22 +02:00
JaniruTEC
9bb24320bf Stopped user from mounting to vaults to the same path 2023-07-24 18:53:19 +02:00
Armin Schrenk
108df3ddbc Merge branch 'main' into develop 
# Conflicts:
#	pom.xml
#	suppression.xml
 2023-07-24 16:38:18 +02:00
Armin Schrenk
9ca1ff1a2d Merge branch 'hotfix/1.9.2' 1.9.2 2023-07-24 16:35:33 +02:00
Armin Schrenk
164a350e7e finalize 1.9.2 2023-07-24 16:34:49 +02:00
Tobias Hagemann
b48ebd524b Merge pull request from GHSA-9c9p-c3mg-hpjq 
Fix LPE in win installer
 2023-07-24 16:23:23 +02:00
Armin Schrenk
7ba9d4de4f Merge branch 'hotfix/1.9.2' into feature/fix-lpe-win-installer 2023-07-24 16:21:54 +02:00
Armin Schrenk
807e718d13 supress non affecting cve 
(cherry picked from commit 4e3b2e0be0)
 2023-07-24 15:38:42 +02:00
Armin Schrenk
6efb839fd0 prepare 1.10.0 1.10.0-beta1 2023-07-24 15:00:28 +02:00
Cryptobot
ca71bb207f New Crowdin updates (#2945) 
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
 2023-07-24 14:58:36 +02:00
Armin Schrenk
0800c53aac update to uninstaller-beta4 2023-07-24 10:36:23 +02:00
Armin Schrenk
8ed1878035 prepare 1.9.2 2023-07-21 17:07:33 +02:00
Armin Schrenk
4e3b2e0be0 supress non affecting cve 2023-07-21 16:50:27 +02:00
JaniruTEC
59d89faf38 Turned calls to "assumeTrue" into guard functions 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1270734307
 2023-07-21 16:48:33 +02:00
JaniruTEC
ca3a11de90 Made AtomicReference to mountHandle final 
[ci skip]
 2023-07-21 16:37:08 +02:00
Armin Schrenk
c2819963d2 Replace custom actions executing bat files to by quiet exec custom actions to surpress shown command prompts 
Closes #GHSA-9c9p-c3mg-hpjq

(cherry picked from commit fb1ba6390dfcb7028be0eb051b893b744c0444dc)
 2023-07-21 16:05:21 +02:00
JaniruTEC
8f67404766 Fixed method violating API contract 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269458822
 2023-07-21 15:35:56 +02:00
mindmonk
91ece74f57 Merge pull request #2998 from cryptomator/feature/update-reminder 
Update Reminder
 2023-07-21 09:46:48 +02:00
JaniruTEC
1942850888 Replaced OS-Check with Assumptions 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269461956
 2023-07-20 16:44:49 +02:00
JaniruTEC
821cc0940d Stopped wrapping IOEs as UncheckedIOEs 
See:
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269444937
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269445672
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269445894
 2023-07-20 16:34:51 +02:00
Jan-Peter Klein
b9f77cb1d6 Merge branch 'develop' into feature/update-reminder 2023-07-20 11:32:12 +02:00
Jan-Peter Klein
b6d09016cd rearranged layout elements and changed window width 2023-07-20 11:31:52 +02:00
Jan-Peter Klein
0a07103a4f moved logic of update checking from FxApplication class to UpdateReminderComponent 2023-07-20 11:06:55 +02:00
Jan-Peter Klein
96253f636a removed unused provide method 2023-07-20 11:05:50 +02:00
JaniruTEC
419a7ab245 Fixed faulty unit test 2023-07-19 23:53:58 +02:00
JaniruTEC
a29ebfd302 Updated error message 2023-07-19 23:39:11 +02:00
JaniruTEC
73da954355 Merge branch 'feature/3001-more-error-messages' into feature/2856-folder-mounts-win 
# Conflicts:
# src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
# src/main/resources/i18n/strings.properties
 2023-07-19 23:38:20 +02:00
Armin Schrenk
c6ab05979c cleanup [ci skip] 2023-07-19 16:33:40 +02:00
Armin Schrenk
2c8d5d3d5d update ci script 2023-07-19 16:30:08 +02:00
Armin Schrenk
b76a311ddc Replace winfsp-uninstaller by downloadlink 2023-07-19 16:24:44 +02:00
JaniruTEC
879e6dcab7 Updated error message 
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1268035540
 2023-07-19 16:10:48 +02:00
JaniruTEC
f9f8a6b357 Added unit tests for MountWithinParentUtil 2023-07-19 15:39:14 +02:00
JaniruTEC
3ea6da3c6d Fixed thrown exception 2023-07-19 15:36:23 +02:00
JaniruTEC
bb0b1b3592 Cleaned up merge 2023-07-19 15:36:22 +02:00
JaniruTEC
0b6782d44b Refactored error message to use ObservableValues 2023-07-18 20:11:24 +02:00
Armin Schrenk
bd932b1067 Fixes #3021 2023-07-18 17:06:03 +02:00
Armin Schrenk
238aaeb5a0 bump integrations-api to stable version 2023-07-18 12:40:06 +02:00