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
JaniruTEC
0dc401883f
Enabled proofreading
...
Removed dict_* files from .gitignore
Added dict_de.xml
Added dict_project.xml
2021-06-12 01:35:36 +02:00
Sebastian Stenzel
7fac6da448
Single maven module ( #1676 )
...
combined all sources into single maven module
2021-06-04 20:09:10 +02:00
Sebastian Stenzel
91a2943599
update to JDK 16
2021-03-17 08:16:26 +01:00
Sebastian Stenzel
96bb97d50a
Added new setting showTrayIcon defaulting to new environment property cryptomator.showTrayIcon
2020-12-16 13:48:33 +01:00
Sebastian Stenzel
c90e445a67
Removed -Dcryptomator.mountPointsDir="/Volumes/" from macOS run profiles
...
[ci skip]
2020-11-18 13:10:01 +01:00
Sebastian Stenzel
2b8f39a149
ignored some derived files
2020-11-02 09:41:07 +01:00
JaniruTEC
2720a999d1
Updated codestyle ( #1388 )
...
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2020-11-02 08:45:41 +01:00
JaniruTEC
8904df91b4
Reverted accidental changes to Project_Default.xml [Skip CI]
2020-10-27 16:18:55 +01:00
JaniruTEC
786365c095
Added ability to skip CI
...
Added check for "Skip CI", added comment
Added filter for skipping CI
2020-10-27 16:12:35 +01:00
JaniruTEC
0a32de2c92
Addded dev run configs, removed fuse-setting from win prod config
2020-10-16 22:38:39 +02:00
JaniruTEC
4cd43a2b1c
Merge branch 'develop' into feature/fuse-on-win
2020-08-19 15:53:26 +02:00
JaniruTEC
58ce1e45b8
Updated Codestyle to not use any arrangements
2020-08-19 15:34:08 +02:00
JaniruTEC
51f7d74e4a
Changed cryptomator.mountPointsDir-property in Windows Configs
...
Changed cryptomator.mountPointsDir-property in Windows Configs from "~/Mount" to "~/Cryptomator
2020-08-03 21:22:22 +02:00
JaniruTEC
1ac6d086bd
Disabled some experimental FUSE Features on Windows
...
Disabled some experimental FUSE Features on Windows unless they are explicitly enabled by using the flag '-Dfuse.experimental="true"'
They are enabled in the default IntelliJ-Config (disabled on Build)
2020-07-28 19:15:56 +02:00
JaniruTEC
e2e7755af2
Added cryptomator.mountPointsDir-property to Windows Configs
2020-07-18 18:57:11 +02:00
Sebastian Stenzel
330b1cbf7d
derived resources after dependency update
...
[ci skip]
2020-06-25 17:15:07 +02:00
Sebastian Stenzel
670d4a165c
fixes #1134 , fixes #1116
...
references #1144
2020-04-28 18:58:25 +02:00
Sebastian Stenzel
07e5e18d4d
Updated IDE settings to use JDK 14
...
[ci skip]
2020-04-21 08:00:55 +02:00
Sebastian Stenzel
cceea1c7c1
Updated dependencies
2020-03-25 17:57:17 +01:00
Sebastian Stenzel
fca793e403
Added "Vault Missing" screen
2020-03-06 16:05:16 +01:00
Sebastian Stenzel
3fac8b7cd6
updated dependencies
2020-02-17 18:12:58 +01:00
Sebastian Stenzel
3396c79c38
updated intellij config
...
[ci skip]
2020-01-06 12:45:01 +01:00
Sebastian Stenzel
1a4d1fffb3
shutdown logback manually
2019-12-11 13:53:32 +01:00
