mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-21 10:06:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,771 Commits 29 Branches 213 Tags
45f038bae2b72a2c886d924925f156e01cb5c504
Commit Graph

300 Commits

Author SHA1 Message Date
Armin Schrenk
45f038bae2 Merge branch 'develop' into feature/hub 
# Conflicts:
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
#	pom.xml
 2022-06-22 09:55:02 +02:00
Armin Schrenk
8c65bd19c2 Make FUSE the default volume impl 2022-06-13 10:00:14 +02:00
JaniruTEC
e6ff7a6d88 Merge pull request #2259 from cryptomator/fix/2258-catching-executors 
Added catching executors
 2022-05-27 18:24:55 +02:00
JaniruTEC
f740a93b6c Applied suggestions from code review 
Changed signature of afterExecuteTask
See: https://github.com/cryptomator/cryptomator/pull/2259/files#r875548549

--

Changed name of "afterExecute0" to "afterExecuteInternal"
See: https://github.com/cryptomator/cryptomator/pull/2259/files#r875551994
 2022-05-27 01:48:11 +02:00
JaniruTEC
e9a71827ed Apply suggestions from code review 
Establishing symmetry with `afterExecuteTask`

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2022-05-27 01:36:10 +02:00
Armin Schrenk
3d95276a7f Feature/2200 illegal use of builders (#2262) 
* Replaced Builder in VaultComponent with Factory
* migrate VaultOptionsComponent

Co-authored-by: JaniruTEC <JaniruTEC@gmail.com>
 2022-05-19 22:07:56 +02:00
JaniruTEC
0040c8a5f8 Added catching executors 2022-05-17 16:30:23 +02:00
Armin Schrenk
4989eacaf9 Fixes #2256 2022-05-16 12:58:36 +02:00
Sebastian Stenzel
87202453b1 added Swahili to language picker 
[ci skip]
 2022-05-13 15:43:43 +02:00
Armin Schrenk
4ecb98a5e6 Merge pull request #2245 from cryptomator/feature/location-preset-enum 
Enumeenize well-known local cloud storage paths
 2022-05-12 16:14:43 +02:00
Armin Schrenk
5ab74affb5 Refactor LocationPreset enum: 
* use static inner class
* add getDisplayName method
* make instance variables final

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2022-05-12 13:47:57 +02:00
Sebastian Stenzel
8230b74c78 moved file picker filter glob to Constants.java 2022-05-12 13:17:33 +02:00
Armin Schrenk
5832e8cd49 Apply suggestions from code review 
Co-authored by: Tobias Hagemann <tobihagemann@users.noreply.github.com>
 2022-05-12 12:15:16 +02:00
Tobias Hagemann
0220af24d0 actually use vault config filename from constants when creating vault 2022-05-12 10:51:00 +02:00
Armin Schrenk
98002f63dc Use enum for well-known local cloud storage paths and move class to commons package 2022-05-12 08:45:03 +02:00
Sebastian Stenzel
120be431ee prepare Cryptomator to eventually change the update check URL 2022-05-10 11:36:40 +02:00
Armin Schrenk
f50eb1f047 Revert "Reset webdavport field if changes are not applied and focus lost" 
This reverts commit c6e9e33feb.
 2022-05-09 13:06:15 +02:00
JaniruTEC
30e1c989d0 Fixed typo 2022-05-01 00:46:36 +02:00
Sebastian Stenzel
d4b3eff42f restored success/error redirects 2022-04-28 12:59:27 +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
Armin Schrenk
c6e9e33feb Reset webdavport field if changes are not applied and focus lost 2022-04-28 12:00:06 +02:00
Armin Schrenk
62c7f95f7c removed logging of unused property 2022-04-28 11:54:51 +02:00
Armin Schrenk
a304427973 Remove last reference of "donationkey" 2022-04-28 11:53:54 +02:00
Sebastian Stenzel
5e06fa7385 Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	pom.xml
 2022-04-27 15:23:38 +02:00
Armin Schrenk
fedb62d99a Merge pull request #2175 from cryptomator/feature/binary-stylesheets 
Prefer binary stylesheets
 2022-04-27 13:06:18 +02:00
Armin Schrenk
8f97235b9a Merge pull request #2189 from cryptomator/feature/on-the-fly-license 
Generate app license on release/ installer build and remove commited third party file
 2022-04-27 13:05:53 +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
d1c4eda072 Merge branch 'develop' into feature/hub 
# Conflicts:
#	.github/workflows/appimage.yml
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
 2022-04-25 15:30:56 +02:00
Armin Schrenk
fbc598fed7 Reordered steps in vault creation and renamed methods 2022-04-22 10:40:18 +02:00
Armin Schrenk
bcfba21900 Create third-party-license file in target directory, use plugin defaults to let it placed inside jar 2022-04-20 17:46:58 +02:00
Armin Schrenk
eb0a2c1267 On macOS show example in dark mode when adding existing vault 2022-04-19 17:34:12 +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
JaniruTEC
bcb2b088ba Applied suggestions from code review 2022-04-13 00:46:11 +02:00
JaniruTEC
f123dff0cd Merge remote-tracking branch 'origin/develop' into 1996-cli-version 
# Conflicts:
#	src/main/java/org/cryptomator/launcher/Cryptomator.java
 2022-04-12 17:44:13 +02:00
Sebastian Stenzel
0ace5bb42b fix copy-paste error in log message 2022-04-11 12:34:50 +02:00
Sebastian Stenzel
b656b591ed prefer .bss over .css 2022-04-11 12:32:07 +02:00
Tobias Hagemann
7dd0f0cb31 Merge pull request #2173 from cryptomator/feature/preferences-interface 
Moved interface preferences to its own tab
 2022-04-11 10:49:14 +02:00
Sebastian Stenzel
9c26d17733 log durations of application start 2022-04-11 09:36:34 +02:00
Sebastian Stenzel
69f3a2bd5a log errors when showing main window 2022-04-11 09:35:35 +02:00
Sebastian Stenzel
a8e73350a6 renamed translation keys 2022-04-09 15:30:16 +02:00
Sebastian Stenzel
9b00cd923c moved interface settings to separate preferences tab 2022-04-09 15:13:53 +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
d861ef0d22 Make use of extended validation to prevent applying a recovery key that didn't sign the vault config 2022-04-05 09:21:33 +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
5a4f714c93 Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
 2022-04-05 07:49:25 +02:00
Sebastian Stenzel
c03bc9ed0b removed unused imports 
[ci skip]
 2022-04-05 07:47:54 +02:00
Sebastian Stenzel
ceb3cbc43f remove unused imports 2022-04-04 15:10:35 +02:00
Sebastian Stenzel
ec909ce723 rethrow AWTException as TrayMenuException 2022-04-04 15:10:24 +02:00