Jan-Peter Klein
f22111e36f
revert unrelated changes
2024-10-02 16:46:41 +02:00
Jan-Peter Klein
958c22bed8
Merge branch 'feature/redesign-mainwindow' in feature/notificationbar
2024-07-16 14:52:50 +02:00
Armin Schrenk
dac517a6fb
update project ot jdk 22
...
Note: dependency bumps regarding jdk22 compatiblilty are missing!
2024-05-02 16:59:45 +02:00
Sebastian Stenzel
0009940e1e
adjusted after dependency update
2024-03-14 12:09:10 +01:00
Armin Schrenk
a013ae3d91
[ci skip] change mountPointDir for macOS-Dev-run profile
...
aligns production build
2024-02-14 10:29:14 +01:00
Sebastian Stenzel
174225c60e
add timeout to OAuth2 requests
2023-10-20 12:03:07 +02:00
Sebastian Stenzel
70805665bf
use features of Java 21 with --enable-preview
2023-09-18 19:21:56 +02:00
Sebastian Stenzel
4043e3f71f
build using JDK 21
2023-09-06 16:22:41 +02:00
Armin Schrenk
1a153e1f6e
Merge branch 'develop' into libappindicator
2023-07-26 14:18:42 +02:00
JaniruTEC
11a0136cb9
Fixed run configurations
...
See: #2982
2023-07-04 13:55:42 +02:00
Ralph Plawetzki
449e330992
Merge branch cryptomator/develop
2023-07-01 18:45:45 +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
Sebastian Stenzel
287584429b
update code style
...
remove line break from `new Object() {}`
[ci skip]
2023-06-29 22:45:57 +02:00
Armin Schrenk
ce596698e3
stick to a unified path separator for cryptomator properties
2023-06-29 17:58:52 +02:00
Armin Schrenk
ebea8ef7e5
adjust windows buildscripts to use appdata instead of userhome/hard/coded/path
2023-06-20 17:32:23 +02:00
Armin Schrenk
ec645a4bb9
replace ~ by @{userhome} on unix systems
2023-06-20 16:37:32 +02:00
Sebastian Stenzel
6bb69ea8d3
Merge branch 'develop' into libappindicator
2023-05-10 20:21:54 +02:00
Ralph Plawetzki
6e858746c1
Keep change to JDK 20 outside of this PR
2023-05-10 06:35:52 +02:00
Armin Schrenk
151ef6c7b2
upgrade to jdk20
...
* use pattern matching preview feature
* bump fuse-nio-adapter
2023-05-08 19:12:35 +02:00
Ralph Plawetzki
317f3c3458
Move stuff to integrations-linux
2023-04-30 17:08:08 +02:00
Ralph Plawetzki
97cede12b7
Update to JDK 20
2023-04-27 18:39:46 +02:00
Ralph Plawetzki
6da107f4db
Add AppindicatorTrayMenuController
2023-04-26 18:24:01 +02:00
Armin Schrenk
20e820c903
update IDE specific files
2023-02-24 12:48:41 +01:00
Sebastian Stenzel
4029f86a0d
reveal OR copy mount point depending on chosen mounter
2022-11-10 14:11:06 +01:00
Sebastian Stenzel
31c69f145e
use a fallback mount point absed on -Dcryptomator.mountPointsDir=... vm param
2022-11-07 18:17:20 +01:00
Sebastian Stenzel
b5a00f5ebe
added --enable-preview --enable-native-access to run config
2022-11-07 18:07:45 +01:00
Armin Schrenk
0f84d0c990
adapt to new APIs
2022-11-07 14:49:56 +01:00
Sebastian Stenzel
69641ed3b6
Merge branch 'develop' into feature/jdk19
...
[ci skip]
2022-10-14 13:55:15 +02:00
Sebastian Stenzel
7bc5a336e4
dependency bump
2022-10-06 16:48:12 +02:00
Sebastian Stenzel
d19e77432e
build with jdk 19
2022-09-21 09:28:37 +02:00
Sebastian Stenzel
649e029d4f
added cryptomator.integrationsMac.keychainServiceName system property
2022-08-05 11:09:49 +02:00
Armin Schrenk
677634930d
Fix windows run config [ci skip]
2022-07-26 13:03:43 +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
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
Sebastian Stenzel
cd709260ce
ignore autogenerated file
...
[ci skip]
2022-05-13 15:48:15 +02:00
Sebastian Stenzel
0b2685f271
adjusted .gitignore to latest IntelliJ IDEA standards
...
see https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems
[ci skip]
2022-05-10 15:23:02 +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
7c772e2767
removed user.language=en and jdk.gtk.version=2 flags from run configurations
...
[ci skip]
2022-04-05 07:46:17 +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
d39c3969df
share charset configuration
...
[ci skip]
2022-03-21 14:05:29 +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
Tobias Hagemann
a4070f551b
fixes #1404
2021-10-27 11:56:49 +02:00
Sebastian Stenzel
a86bd9f13a
implemented new algorithm
...
[ci skip]
2021-10-13 12:12:56 +02:00
Sebastian Stenzel
6c6f6baf12
Update to JDK 17 ( #1828 )
...
fixes #1404
2021-10-08 14:59:24 +02:00
Sebastian Stenzel
ec9a4465eb
add cryptomator.pluginDir environment variable
2021-08-24 16:35:07 +02:00
Sebastian Stenzel
b21ea61342
add first draft for hub+http / hub+https keyloading scheme
2021-07-28 17:29:44 +02:00
Sebastian Stenzel
03182ae4e0
fixed typos
2021-07-14 12:46:17 +02:00
Sebastian Stenzel
755eb70ae8
Use UNIX Sockets for IPC
2021-07-13 18:18:38 +02:00
