mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-19 19:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,766 Commits 36 Branches 214 Tags
9be00a2693776bf4ccfff148e4e4f660a7da618e
Commit Graph

4766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ralph Plawetzki
3ae847d5ad Code improvements and changes 
Discussion: https://github.com/cryptomator/integrations-linux/pull/22#pullrequestreview-1479004107
 2023-06-15 06:46:05 +02:00
Jan-Peter Klein
d680c5812d cleaned up code and using parameterized tests 2023-06-14 16:10:11 +02:00
Ralph Plawetzki
58bb266085 Find native libraries on the system 2023-06-14 11:20:15 +02:00
Ralph Plawetzki
c8ed30574a Introduce JVM property for the SVG image loading path 2023-06-14 06:02:03 +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
Ralph Plawetzki
1cb5a3531a Fix symlinks for icons installed with the ppa 2023-06-06 19:44:02 +02:00
Ralph Plawetzki
d5cad1a704 Lost+found 
Things I forgot or could be more simple
 2023-06-05 19:13:25 +02:00
Sebastian Stenzel
c9dd7454f5 Merge branch 'develop' into feature/libappindicator 
# Conflicts:
#	pom.xml
 2023-06-04 20:40:03 +02:00
Sebastian Stenzel
7a7332a3f6 remove executable bit 2023-06-04 14:29:17 +02:00
Sebastian Stenzel
a22bfacfa2 create symlinks from "symbolic" to "scalable" icons 2023-06-04 14:18:05 +02:00
Sebastian Stenzel
1abf591459 cleanup 2023-06-04 14:17:57 +02:00
Ralph Plawetzki
641b21a144 Symbolic icons for the ppa 2023-06-02 06:31:35 +02:00
Ralph Plawetzki
20664ff3d3 1.3.0-beta3 is available 2023-06-02 05:42:04 +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