 Sebastian Stenzel
|
12d38335d8
|
increase width of preferences window, which should fix #2107
|
2022-04-09 15:05:05 +02:00 |
|
|
Sebastian Stenzel
|
2108a77e12
|
adjusted build scripts for Cryptomator Hub
|
2022-04-08 20:45:22 +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
|
752e61219c
|
Merge pull request #2161 from cryptomator/feature/check-vaultconfig-sig-during-key-recovery
Prevent key recovery for foreign vault
|
2022-04-05 12:03:12 +02:00 |
|
|
Sebastian Stenzel
|
d308ee626a
|
more descriptive name
[ci skip]
|
2022-04-05 09:27:44 +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
|
9ed7438f05
|
bump zxcvbn4j version, fixes #979
|
2022-04-05 08:00:05 +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
|
7c772e2767
|
removed user.language=en and jdk.gtk.version=2 flags from run configurations
[ci skip]
|
2022-04-05 07:46:17 +02:00 |
|
|
Sebastian Stenzel
|
3136e22414
|
Merge pull request #2150 from cryptomator/feature/language-switcher
|
2022-04-04 20:59:23 +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
|
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 |
|
|
Sebastian Stenzel
|
2ce7e84e3c
|
Merge branch 'develop' into feature/gtk2-launcher
|
2022-04-04 06:58:07 +02:00 |
|
|
Sebastian Stenzel
|
d7da78fc07
|
adjust to latest API
|
2022-04-03 15:26:04 +02:00 |
|
|
Sebastian Stenzel
|
e93e31e745
|
Merge branch 'develop' into feature/integrations-api-1.1.0
# Conflicts:
# pom.xml
# src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
# src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
# src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
# src/main/resources/license/THIRD-PARTY.txt
|
2022-04-03 12:53:08 +02:00 |
|
|
Sebastian Stenzel
|
5dc8fd2582
|
made constant final
|
2022-04-03 12:25:15 +02:00 |
|
|
Sebastian Stenzel
|
77d81acb1e
|
added "English" as first option
|
2022-04-02 15:54:37 +02:00 |
|
|
Sebastian Stenzel
|
71d346eddd
|
apply chosen language at application start
|
2022-04-02 12:17:10 +02:00 |
|
|
Sebastian Stenzel
|
d9aa6ae91a
|
display "language" chooser in general preferences
|
2022-04-02 12:16:57 +02:00 |
|
|
Sebastian Stenzel
|
c130441700
|
add setting for user-chosen "language"
|
2022-04-02 12:15:09 +02:00 |
|
|
Sebastian Stenzel
|
6af016f1fe
|
log errors occuring in async "show window" tasks
|
2022-04-02 11:51:34 +02:00 |
|
|
Sebastian Stenzel
|
ec2524f6ff
|
use correct StartupWMClass (fixes #1955)
[ci skip]
|
2022-04-02 10:06:15 +02:00 |
|
|
Sebastian Stenzel
|
27d4e00210
|
Merge branch 'develop' into feature/gtk2-launcher
|
2022-04-02 10:01:25 +02:00 |
|
|
Sebastian Stenzel
|
0cd2ecb0b3
|
Merge pull request #2139 from cryptomator/feature/javafx-launcher
Refactored Launcher Component Graph
|
2022-04-02 09:59:45 +02:00 |
|
|
Sebastian Stenzel
|
a143ecdcf8
|
Refactored use of StageFactory
|
2022-04-01 17:42:29 +02:00 |
|
|
Sebastian Stenzel
|
2d830cdb31
|
easier-to-understand if/else for combinations of "startHidden" and "hasTrayIcon"
fixes bug when startHidden was false and hasTrayIcon was true
|
2022-04-01 15:36:20 +02:00 |
|
|
Sebastian Stenzel
|
887e0332da
|
changed misleading comment
[ci skip]
|
2022-04-01 14:50:27 +02:00 |
|
|
Sebastian Stenzel
|
c1504e29c1
|
added documentation
[ci skip]
|
2022-04-01 14:48:14 +02:00 |
|
|
Sebastian Stenzel
|
0bb6e64d83
|
when "starting hidden", only minimize when there is no tray icon
|
2022-04-01 14:01:58 +02:00 |
|
|
Sebastian Stenzel
|
c7d1b9dbd6
|
don't prompt user if quitting directly after app start
|
2022-03-31 16:32:17 +02:00 |
|
 Armin Schrenk
|
a4c50da222
|
replicate naming scheme of win exe installer in CI job to local build
|
2022-03-31 11:12:50 +02:00 |
|
|
Sebastian Stenzel
|
a558135fec
|
Rename .exe Installer Bundle (#2145)
|
2022-03-31 11:03:15 +02:00 |
|
|
Sebastian Stenzel
|
7df449524a
|
fixed lock workflow
|
2022-03-31 10:03:02 +02:00 |
|
|
Sebastian Stenzel
|
d475444829
|
fixed some code smells
|
2022-03-31 09:59:16 +02:00 |
|
|
Sebastian Stenzel
|
828f32d3f6
|
Merge branch 'develop' into feature/gtk2-launcher
|
2022-03-31 08:57: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
|
28db04e621
|
arm av allowlisting
[ci skip]
|
2022-03-31 08:37:00 +02:00 |
|
|
Sebastian Stenzel
|
e2184ec009
|
upload .msi and .exe to AV allowlisting servers
|
2022-03-31 08:20:49 +02:00 |
|
|
Sebastian Stenzel
|
5f1f95da74
|
Merge branch 'main' into develop
[ci skip]
|
2022-03-31 08:05:53 +02:00 |
|
|
Sebastian Stenzel
|
4b29f0b4f3
|
Merge branch 'release/1.6.8'
1.6.8
|
2022-03-30 18:03:54 +02:00 |
|
|
Sebastian Stenzel
|
f8bcbda8d7
|
add safeguard to prevent release in case of missing signature
|
2022-03-30 18:03:15 +02:00 |
|
|
Sebastian Stenzel
|
e368087c3e
|
Merge branch 'develop' into release/1.6.8
|
2022-03-30 18:02:13 +02:00 |
|
|
Sebastian Stenzel
|
ddb5da1d79
|
reintroduce condition for signing the tarball
[ci skip]
|
2022-03-30 17:56:01 +02:00 |
|
|
Sebastian Stenzel
|
d2374fb8cd
|
deleted yet another use of github.ref
|
2022-03-30 17:50:45 +02:00 |
|
|
Sebastian Stenzel
|
c73aa49b59
|
always run the tarball signature step (for testing ${{ github.ref_name }})
|
2022-03-30 17:46:31 +02:00 |
|