mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 02:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,549 Commits 36 Branches 214 Tags
79eea4814ec361745fc8dfe3ddfc307e705b38f9
Commit Graph

4549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Schrenk
79eea4814e renamed class 2023-06-29 18:56:32 +02:00
Armin Schrenk
cee0486d71 adding unit tests for getProperty 2023-06-29 18:55:49 +02:00
Armin Schrenk
12e990a8b3 cleanup 2023-06-29 18:24:48 +02:00
Armin Schrenk
24fc2888ef more unit tests 2023-06-29 18:20:25 +02:00
Armin Schrenk
9b0c940195 readd unit tests for Environment.java 2023-06-29 18:13:54 +02:00
Armin Schrenk
ce596698e3 stick to a unified path separator for cryptomator properties 2023-06-29 17:58:52 +02:00
Armin Schrenk
9383abbdbd let child method match parent 2023-06-29 15:55:07 +02:00
Armin Schrenk
a31d3185dc move boilerplate code to own class 2023-06-29 15:51:46 +02:00
Armin Schrenk
3098628db1 Fix problem of circular class init 2023-06-29 15:32:15 +02:00
Armin Schrenk
6c18e3a929 apply suggestion from sonarCloud 2023-06-29 13:04:00 +02:00
Armin Schrenk
c0368f2a50 Merge branch 'develop' into feature/preprocess-properties 2023-06-29 12:39:31 +02:00
Armin Schrenk
c6c292b505 bump google guava to 32.0.1 2023-06-29 12:39:19 +02:00
Armin Schrenk
ebc60c4fb3 make process function reliable testable and adjust unit test 2023-06-29 12:35:59 +02:00
Sebastian Stenzel
b2a184bdf0 ignore unknown fields during JWT deserialization 2023-06-29 12:02:33 +02:00
Armin Schrenk
01da51e6e7 Refactor properties preprocessing: 
* decorate Properties class
* set the system properties to decorator
* for logging setup, skip enviroment and access props over decorator
 2023-06-29 11:37:35 +02:00
Armin Schrenk
8417618615 Revert "fix missing logDir path resolution" 
This reverts commit b3d8df0da0.
 2023-06-28 16:04:10 +02:00
Tobias Hagemann
fe3abcaaa8 added leitzcloud location preset 2023-06-27 09:36:14 +02:00
Tobias Hagemann
56ba12fe56 fixed location presets of google drive and pcloud on macos 2023-06-27 09:31:43 +02:00
Armin Schrenk
5e52f715ce Merge branch 'develop' into feature/preprocess-properties 2023-06-21 10:31:43 +02:00
Armin Schrenk
2c2606d6ad Merge pull request #2961 from sschuberth/win-drive-occupied 
Show a dedicated message when mounting to an occupied Windows drive

Fixes #2309
 2023-06-20 18:25:00 +02:00
Armin Schrenk
b3d8df0da0 fix missing logDir path resolution 2023-06-20 18:08:31 +02:00
Armin Schrenk
ebea8ef7e5 adjust windows buildscripts to use appdata instead of userhome/hard/coded/path 2023-06-20 17:32:23 +02:00
Armin Schrenk
ec645a4bb9 replace ~ by @{userhome} on unix systems 2023-06-20 16:37:32 +02:00
Armin Schrenk
2c0474ec46 add test 2023-06-20 12:37:07 +02:00
Sebastian Schuberth
4d09728880 Suppress a CVE false-positive for jackson-databind 2.14.2 
Also see https://github.com/cryptomator/cryptomator/pull/2961#issuecomment-1597652134.
 2023-06-19 22:31:50 +02:00
Sebastian Schuberth
173b1e8386 Show a dedicated message when mounting to an occupied Windows drive 
The error message was restored from 6395f17. Fixes #2309.
 2023-06-16 19:17:30 +02:00
mindmonk
9b18a179c2 Merge pull request #2953 from cryptomator/feature/error-dialog 
Improved Error Dialog
 2023-06-16 15:55:43 +02:00
Jan-Peter Klein
12b38ad8c8 removed extra tabs generated by reformat code 2023-06-16 15:25:22 +02:00
Armin Schrenk
4065e15aa1 Apply code suggestion from review 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2023-06-16 13:12:00 +02:00
Jan-Peter Klein
6fda206b9e just one little change 2023-06-16 12:57:21 +02:00
Jan-Peter Klein
638a6d1195 optimized code 2023-06-16 12:56:07 +02:00
Jan-Peter Klein
27bc62e602 Merge branch 'develop' into feature/error-dialog 2023-06-16 12:48:28 +02:00
Tobias Hagemann
2e7af0affa Update SECURITY.md 
[ci skip]
 2023-06-16 11:41:33 +02:00
Tobias Hagemann
19c41a3cca Update SECURITY.md 
[ci skip]
 2023-06-16 11:20:26 +02:00
Jan-Peter Klein
3bf4473f9d implemented changes mentioned by overheadhunter 2023-06-16 11:13:24 +02:00
Jan-Peter Klein
f92c436339 reformat code and optimize imports 2023-06-15 13:12:10 +02:00
Jan-Peter Klein
f054a1af03 optimized tests and some code docu 2023-06-15 10:54:44 +02:00
Armin Schrenk
c46eeb0401 first impl draft 2023-06-15 10:38:19 +02:00
Jan-Peter Klein
d680c5812d cleaned up code and using parameterized tests 2023-06-14 16:10:11 +02:00
Jan-Peter Klein
3120751d3e resolved sonarclouds mentioned issues 2023-06-13 12:48:35 +02:00
Jan-Peter Klein
3c623b7ed1 cleaned up code 2023-06-12 21:04:54 +02:00
Jan-Peter Klein
150dd3e542 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into feature/error-dialog 2023-06-12 13:52:23 +02:00
Jan-Peter Klein
8f3f23939c created some tests for ErrorController 2023-06-12 13:50:43 +02:00
Armin Schrenk
5d796efe30 Merge branch 'main' into develop 2023-06-07 12:56:23 +02:00
Armin Schrenk
702ae72063 Merge branch 'release/1.9.1' 1.9.1 2023-06-07 12:55:46 +02:00
Armin Schrenk
b296dc775c finalize 1.9.1 2023-06-07 12:55:28 +02:00
Armin Schrenk
e5e0d4076a prepare 1.9.1 2023-06-07 12:52:42 +02:00
Armin Schrenk
da0eeb2e45 bump dependency-check 2023-06-07 12:50:24 +02:00
Armin Schrenk
ff49094f35 fixes #2936 2023-06-07 12:50:09 +02:00
Cryptobot
be1c5da54e New Crowdin updates (#2931) 
New translations strings.properties

Filipino; Finnish; Hungarian; Slovak;

[ci skip]
 2023-06-07 11:08:14 +02:00