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

4534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
ef22928e01 undo formatter-induced changes 
[ci skip]
 2023-06-29 22:53:19 +02:00
Sebastian Stenzel
e23c0c23c9 remove GSON from dependencies 2023-06-29 22:44:22 +02:00
Sebastian Stenzel
e9bb3195dd cleanup 2023-06-29 22:44:05 +02:00
Sebastian Stenzel
b1ff94bdd6 replace GSON from settings 2023-06-29 22:41:19 +02:00
Sebastian Stenzel
3c53968dd2 replace GSON from update checker 2023-06-29 13:20:39 +02:00
Sebastian Stenzel
99862869bc replace GSON from error dialog 2023-06-29 13:03:27 +02:00
Sebastian Stenzel
5f2497de90 replace GSON in "hub" 2023-06-29 12:26:45 +02:00
Sebastian Stenzel
b2a184bdf0 ignore unknown fields during JWT deserialization 2023-06-29 12:02:33 +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
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
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
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
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
Armin Schrenk
40abf582c5 bump guava 2023-06-01 17:48:14 +02:00
Armin Schrenk
a8377be691 adjust init release notes file 2023-06-01 17:47:18 +02:00
Jan-Peter Klein
0e7a27b2e1 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into feature/error-dialog 2023-05-30 12:06:50 +02:00
Jan-Peter Klein
d82d11feb7 optimized implementation 2023-05-30 12:03:56 +02:00
Armin Schrenk
81c12f50fe Merge branch 'main' into develop [ci skip] 2023-05-30 10:46:07 +02:00
Armin Schrenk
e2eac0e398 Merge branch 'release/1.9.0' 1.9.0 2023-05-30 10:44:02 +02:00
Armin Schrenk
9d573c497e finalize 1.9.0 2023-05-30 10:34:51 +02:00
Armin Schrenk
81087a9568 Merge branch 'develop' into release/1.9.0 2023-05-30 10:30:47 +02:00
Cryptobot
2806525397 New Crowdin updates (#2881) 
New translations strings.properties

Bulgarian; Finnish; German; Japanese; Portuguese; Portuguese, Brazilian; Turkish; Ukrainian; 

[ci skip]
 2023-05-30 10:29:07 +02:00
Armin Schrenk
0c0060262a prepare 1.9.0 1.9.0-beta1 2023-05-26 16:37:53 +02:00
Armin Schrenk
9af4ffe83b use correct webdav adapter version 2023-05-26 15:44:10 +02:00
Armin Schrenk
c6f963793d bump dependencies 2023-05-26 13:10:11 +02:00
Armin Schrenk
8c34fc76c5 prevent regressions for google drive preset 2023-05-24 12:07:08 +02:00
Armin Schrenk
785cf7a9a6 Merge pull request #2918 from cryptomator/feature/refactor-location-presets 
Feature: Refactor finding and showing cloud location presets
 2023-05-23 17:32:48 +02:00
Armin Schrenk
c63837c4ce renaming class 2023-05-23 17:01:14 +02:00