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,450 Commits 36 Branches 214 Tags
2d17ad9a2edd64e4be8cc065b77ebe699b5ffd49
Commit Graph

64 Commits

Author SHA1 Message Date
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
Sebastian Stenzel
dc6b5774b8 Merge branch 'develop' into feature/javafx-launcher 
# Conflicts:
#	pom.xml
 2022-03-31 08:55:49 +02:00
Sebastian Stenzel
e907360419 refactored launcher, deleted UiLauncherModule 
component graph is now: Main → FxApplicationComponent → Tray, MainWindow, etc
 2022-03-29 20:39:46 +02:00
Armin Schrenk
ef6f87bb19 Fixes #2126 
Remove deprecated env variable
 2022-03-29 17:24:01 +02:00
Sebastian Stenzel
8fa562aa60 bumped dependencies 2022-03-23 10:42:20 +01:00
Sebastian Stenzel
6bad74720f Merge branch 'develop' into feature/simplified-workflow-results 2022-03-21 13:56:24 +01:00
Armin Schrenk
9b001b5071 Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com> 2022-03-03 17:45:21 +01:00
Armin Schrenk
fba0df10f9 Resolve code smells and a bug 
Co-authored-by: sonarcloud <sonarcloud@users.noreply.github.com>
 2022-03-02 15:28:01 +01:00
Armin Schrenk
f148973bef fix wrong visibillity 2022-03-02 14:50:26 +01:00
Armin Schrenk
4f4c992493 Further improvements: 
* make PARENT_NO_MOUNTPOINT preps system agnostic
* add unit tests for cleanup
 2022-03-02 14:40:27 +01:00
Armin Schrenk
e15b68fc9b Refactor winfsp mount preps and add unit tests 2022-02-28 18:54:01 +01:00
Sebastian Stenzel
e95853deac make test public, fixing InaccessibleObject error in maven build 2021-12-16 16:46:57 +01:00
Sebastian Stenzel
d72d9f533c Replace CharBuffer and char[] instances by destroyable Passphrase 2021-12-16 16:41:07 +01:00
Armin Schrenk
921dd8fe67 Add query to redirection to provide more context in the frontend (#1973) 
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
 2021-12-10 13:42:37 +01:00
Sebastian Stenzel
0110e5bedd added JWE decryption helper 2021-12-09 14:02:39 +01:00
Sebastian Stenzel
5924e443fb Merge branch 'develop' into feature/hub 
# Conflicts:
#	.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
 2021-11-02 15:53:23 +01:00
Sebastian Stenzel
5c98fe4145 fixed accessibility issue 2021-10-25 19:50:39 +02:00
Sebastian Stenzel
9b79e9e69e fixed second part of error code (#1741) 2021-10-25 19:34:45 +02:00
Sebastian Stenzel
1015542629 adjust to latest API 2021-09-27 13:31:05 +02:00
JaniruTEC
3e216ed0ac Added error codes to error screen (#1741) 
Added error codes based on a translation of GeneratedErrorCode.kt (Cryptomator Android) into Java:

Source of GeneratedErrorCode.kt: 3ae90ab521/presentation/src/main/java/org/cryptomator/presentation/logging/GeneratedErrorCode.kt

Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
 2021-09-21 17:41:54 +02:00