Armin Schrenk
e5003c1783
use quick access service in unlock/lock
2024-06-27 17:47:05 +02:00
Armin Schrenk
a013ae3d91
[ci skip] change mountPointDir for macOS-Dev-run profile
...
aligns production build
2024-02-14 10:29:14 +01: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
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
Ralph Plawetzki
317f3c3458
Move stuff to integrations-linux
2023-04-30 17:08:08 +02:00
Ralph Plawetzki
6da107f4db
Add AppindicatorTrayMenuController
2023-04-26 18:24:01 +02: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
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
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
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
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
Sebastian Stenzel
7fac6da448
Single maven module ( #1676 )
...
combined all sources into single maven module
2021-06-04 20:09:10 +02: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
JaniruTEC
0a32de2c92
Addded dev run configs, removed fuse-setting from win prod config
2020-10-16 22:38:39 +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
670d4a165c
fixes #1134 , fixes #1116
...
references #1144
2020-04-28 18:58:25 +02:00
Sebastian Stenzel
f4ee8d0a15
Added I/O stats (work in progress)
2019-08-27 15:50:15 +02:00
Unknown
2b44f0ee9f
updated IDE config
...
[ci skip]
2019-04-24 12:49:35 +02:00
Sebastian Stenzel
efa7f78ffd
Added IDE run configuration
...
[ci skip]
2019-04-12 13:20:42 +02:00
Sebastian Stenzel
8cba58075d
fixes #840
2019-02-27 17:23:08 +01:00
Sebastian Stenzel
dd190b5a16
added vm arg for mount dir
2019-02-26 12:15:35 +01:00
Sebastian Stenzel
f8e5d8aefb
added macOS run configuration
2019-02-25 21:20:12 +01:00
