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,578 Commits 36 Branches 214 Tags
e5047c242cdf451dc4ff39efecac6240c580fecb
Commit Graph

4578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JaniruTEC
e5047c242c Moved subcomponent-bindings 
Moved bindings for VaultOptionsComponent and HealthCheckComponent from MainWindowModule to FxApplicationModule
 2023-07-04 15:35:23 +02:00
JaniruTEC
131145e8b8 Merge branch 'develop' into feature/2981-differ-options-preferences 2023-07-04 14:00:44 +02:00
JaniruTEC
11a0136cb9 Fixed run configurations 
See: #2982
 2023-07-04 13:55:42 +02:00
Armin Schrenk
e92b80bdf4 fix local win build script to download jfxmods 2023-07-04 12:42:55 +02:00
Armin Schrenk
9d81b2312f fix local build script to parse two digit verison nums correctly 2023-07-04 12:41:58 +02:00
Armin Schrenk
511dbe355a Fixes #2982 2023-07-04 12:41:06 +02:00
JaniruTEC
cca6d475b3 Updated UI 2023-07-03 21:14:12 +02:00
JaniruTEC
88c6246ceb Prepared UnlockInvalidMountPointController for new feature 2023-07-03 21:08:49 +02:00
Armin Schrenk
168b9ef096 changed default folder mount location on macOS 2023-07-03 13:11:38 +02:00
Sebastian Stenzel
6c8005e1b2 use github.ref instead of inputs.ref 
[ci skip]
 2023-07-03 10:59:32 +02:00
Sebastian Stenzel
ed8457ff36 remove dead test 2023-06-30 13:53:25 +02:00
Sebastian Stenzel
a50bc8e05c reduce api surface 2023-06-30 13:53:06 +02:00
Sebastian Stenzel
e382a3bab9 make settings' fields public, remove accessor methods 2023-06-30 13:52:15 +02:00
Sebastian Stenzel
9cd50e8ae4 Merge pull request #2974 from cryptomator/feature/replace-gson 
Replace GSON with Jackson
 2023-06-30 13:48:19 +02:00
Sebastian Stenzel
1a6836dac6 remove unnecessary annotation 
[ci skip]
 2023-06-30 12:39:48 +02:00
Armin Schrenk
067814d5db Merge pull request #2957 from cryptomator/feature/preprocess-properties 
Feature: Preprocess JVM properties at app start to adjust to OS environment.

Closes #2838
 2023-06-30 12:38:55 +02:00
Armin Schrenk
29d63a0a83 final clean up 2023-06-30 11:57:09 +02:00
Armin Schrenk
8c3ede0d2a clean up 2023-06-30 11:20:28 +02:00
Armin Schrenk
ee82965ef5 adding "integration tests" 2023-06-30 11:20:07 +02:00
Armin Schrenk
ab048508a8 change getProperty(key, default) and add unit test 2023-06-30 10:57:36 +02:00
Sebastian Stenzel
47ae271126 cleanup 
[ci skip]
 2023-06-29 23:00:19 +02:00
Sebastian Stenzel
ef22928e01 undo formatter-induced changes 
[ci skip]
 2023-06-29 22:53:19 +02:00
Sebastian Stenzel
287584429b update code style 
remove line break from `new Object() {}`

[ci skip]
 2023-06-29 22:45:57 +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
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
Sebastian Stenzel
3c53968dd2 replace GSON from update checker 2023-06-29 13:20:39 +02:00
Armin Schrenk
6c18e3a929 apply suggestion from sonarCloud 2023-06-29 13:04:00 +02:00
Sebastian Stenzel
99862869bc replace GSON from error dialog 2023-06-29 13:03:27 +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
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
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