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,549 Commits 36 Branches 214 Tags
79eea4814ec361745fc8dfe3ddfc307e705b38f9
Commit Graph

83 Commits

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
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
c0368f2a50 Merge branch 'develop' into feature/preprocess-properties 2023-06-29 12:39:31 +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
5e52f715ce Merge branch 'develop' into feature/preprocess-properties 2023-06-21 10:31:43 +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
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
8f3f23939c created some tests for ErrorController 2023-06-12 13:50:43 +02:00
Jürgen Kleer
10c60d7492 https://github.com/cryptomator/cryptomator/issues/2813 
> List of languages should have system default, English and then all other languages in alphabetic order.
> That is, in alphabetic order with respect to the language the list is localized in (seems to be English always)
 2023-04-26 15:24:50 +02:00
Armin Schrenk
2e0908ab15 replace config manually instead of using CryptoFileSystem.init() 2023-04-21 09:40:34 +02:00
Armin Schrenk
d9f945e70a Apply suggestions from code review 
more renaming

Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
 2023-04-18 15:34:20 +02:00
Armin Schrenk
dc9b39202f rename classes 2023-04-18 14:34:48 +02:00
Armin Schrenk
3a50c32e50 rework convert button logic 2023-04-04 12:42:23 +02:00
Armin Schrenk
6c11cc8f1d complete workflow 2023-03-30 16:47:30 +02:00
Armin Schrenk
219ee0da9a implement core functionality 2023-03-28 14:02:11 +02:00
Armin Schrenk
7aa554498b move new password files to changepassword package 2023-02-23 13:00:51 +01:00
Armin Schrenk
73d8c4098e resolve TODOs 2023-01-11 16:18:05 +01:00
Armin Schrenk
f3fcfc913b Remove unused class 2023-01-02 12:10:46 +01:00
Armin Schrenk
5143fdccbb Refactor mount point setting and controller : 
* remove CustomMountPath, winDriveLetter and usesCustomMountPath
* new property mountPoint (can be null)
* differentiation between driveLetter and directory happens in controller
 2022-11-11 19:42:59 +01:00
Sebastian Stenzel
40c4300012 fixed json syntax error 2022-11-07 16:20:19 +01:00
Sebastian Stenzel
1b4117de38 volume settings → change tcp port 2022-11-07 16:16:10 +01:00
Armin Schrenk
0f84d0c990 adapt to new APIs 2022-11-07 14:49:56 +01:00
Sebastian Stenzel
7091839f08 Merge pull request #2505 from cryptomator/feature/javafx-19 2022-10-28 22:09:29 +02:00
Sebastian Stenzel
8040b71a51 simplified some more bindings 2022-10-10 12:09:30 +02:00
Sebastian Stenzel
cde67966da fix test 2022-09-21 09:49:57 +02:00
Sebastian Stenzel
0501b0ef39 fixed test 2022-08-11 18:23:33 +02:00
Armin Schrenk
8662abae5a Merge branch 'feature/hub' into develop 
# Conflicts:
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	dist/win/build.ps1
#	src/main/java/org/cryptomator/common/Environment.java
 2022-07-26 12:29:33 +02:00
Armin Schrenk
d814c1cfca Update integrations-win lib (#2331) 
* update to integrations-win 1.1.2

* refactor environment class to reduce maintenance

* fix test

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2022-07-11 15:59:54 +02:00
Jan-Peter Klein
8f85777887 implemented functionality of feature request issue #1713 "On closing of the application: Always lock and quit – without asking" 2022-05-31 11:18:20 +02:00
Sebastian Stenzel
9f0e269baf Merge branch 'develop' into feature/hub 
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
 2022-04-28 12:55:55 +02:00
Sebastian Stenzel
9d4f9c12b9 outsourced authorization flow to https://github.com/coffeelibs/tiny-oauth2-client 2022-04-25 16:28:54 +02:00
Sebastian Stenzel
2b255ed101 Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
 2022-04-13 07:21:59 +02:00
Sebastian Stenzel
9ece1f66a1 bumped API to 1.1.0-rc1 2022-04-13 07:16:19 +02:00
Sebastian Stenzel
f3bfe7b64c Merge branch 'develop' into feature/hub 
# Conflicts:
#	.github/workflows/release.yml
#	.idea/runConfigurations/Cryptomator_Linux.xml
#	.idea/runConfigurations/Cryptomator_Linux_Dev.xml
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	.idea/runConfigurations/Cryptomator_macOS.xml
#	.idea/runConfigurations/Cryptomator_macOS_Dev.xml
#	pom.xml
#	src/main/java/module-info.java
#	src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/SelectMasterkeyFileController.java
#	src/main/resources/license/THIRD-PARTY.txt
 2022-04-08 20:27:02 +02:00
Sebastian Stenzel
d308ee626a more descriptive name 
[ci skip]
 2022-04-05 09:27:44 +02:00
Sebastian Stenzel
78a50548ab optionally allow extended key validation in RecoveryKeyFactory#validateRecoveryKey 2022-04-05 09:19:58 +02:00
Sebastian Stenzel
4c363a9abc dealing with deprecation 2022-04-05 08:14:14 +02:00
Sebastian Stenzel
9ed7438f05 bump zxcvbn4j version, fixes #979 2022-04-05 08:00:05 +02:00
Sebastian Stenzel
508b9f5c64 test if bundle for supported locales exist and are not empty 2022-04-04 15:57:01 +02:00
Sebastian Stenzel
d10c8fcf17 amend settings deserialization test 2022-04-04 15:13:27 +02:00