184 Commits

Author SHA1 Message Date
Armin Schrenk
d378d84832
bump fuse-nio-adapter 2023-02-03 13:19:43 +01:00
Armin Schrenk
822e863e27
partially revert 220782b84f3f1433e91ac0874c7fb35f87724807 2023-01-26 16:29:43 +01:00
Armin Schrenk
220782b84f
reduce jars neede to stay on classpath due to missing module info 2023-01-26 13:28:55 +01:00
Armin Schrenk
1c104737c1
Merge pull request #2639 from cryptomator/feature/mount-provider
Refactoring: Use mount service
2023-01-26 13:20:11 +01:00
Armin Schrenk
7c8a519919
bump webdav-nio-adapter 2023-01-26 13:10:32 +01:00
Armin Schrenk
c3fb58f7d0
bump fuse-nio-adapter 2023-01-25 16:49:00 +01:00
Armin Schrenk
5d348ee229
Bump WebDAV dependency 2023-01-23 14:39:21 +01:00
Armin Schrenk
3587d53d15
bump integrations-mac, fixes NoSuchServiceException for RevealPathService on macOS 2023-01-23 11:09:15 +01:00
Armin Schrenk
90408504e2
Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	pom.xml
#	src/main/java/org/cryptomator/common/vaults/Vault.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
2023-01-20 15:27:48 +01:00
Armin Schrenk
c8c44e0554
bump fuse-nio-adapter dependency 2023-01-20 15:01:31 +01:00
Tobias Hagemann
d6388d6205
Added drop zone for revealing encrypted files or folders (#2592)
* Added drop zone for revealing encrypted files or folders

* Split god drop zone into distinct drop zones in vault list and vault detail unlocked

* Prevent cursor from changing if content doesn't match during drag over

[ci skip]

* Removed unused methods / css classes

[ci skip]

* Updated method name

* Refactor Vault::getCiphertextPath to only accept strings starting with "/"

* bump cryptofs

* ensure that path cleartext path always starts with "/"

* added file chooser for revealing encrypted items

* Trying to fix path parsing again

* Updated drag & drop design for buttons

* use RevealPathService to reveal files in file manager

* fix compilation error

* Copy paths to clipboard if no revealService is present

* reintegrate wongFileAlert

* Only accept TrasnferMode.LINK

* updated drag-n-drop button styling

* added tooltip

* updated string

* cleanup

Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2023-01-20 10:46:00 +01:00
Armin Schrenk
24d472ed8b
Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
2023-01-11 16:01:27 +01:00
Armin Schrenk
523e5d7904
bump webdav- and dokany-adapter 2023-01-11 15:59:17 +01:00
Tobias Hagemann
304064d9ab
updated dependency-check version 2023-01-09 11:59:51 +01:00
Armin Schrenk
fd5aeaf90a Merge branch 'develop' into feature/mount-setting-per-vault 2023-01-02 13:47:30 +01:00
Armin Schrenk
0b0870e313
Merge pull request #2575 from VsevolodGolovanov/issue_2557_unlocked_status_indicator_in_tray_icon
Unlocked status indicator in tray icon 

Closes #2557
2022-12-30 11:40:51 +01:00
Armin Schrenk
8009205da7
Merge branch 'main' into develop
# Conflicts:
#	pom.xml
2022-12-14 20:07:24 +01:00
Armin Schrenk
8e902877a3
Update dependency-check plugin and exclude false positive
(cherry picked from commit ebcd0adf78b12dd9883a2bab20a3a8349c12ca2d)
2022-12-14 20:06:23 +01:00
Armin Schrenk
975baf594c
Fixes #2576 2022-12-14 19:58:22 +01:00
Vsevolod Golovanov
5a99c7bb61 Unlocked status indicator in tray icon #2557
Now tracking unlockedness and updating the icon accordingly.
2022-12-14 21:18:37 +04:00
Armin Schrenk
ba66d4bfce
bump fuse-nio-adapter 2022-12-07 17:39:27 +01:00
Armin Schrenk
c45a00377d
Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	.github/workflows/appimage.yml
#	.github/workflows/mac-dmg.yml
#	.github/workflows/win-exe.yml
#	pom.xml
#	src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
#	src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
2022-12-07 17:01:56 +01:00
Armin Schrenk
ebcd0adf78
Update dependency-check plugin and exclude false positive 2022-12-07 14:17:42 +01:00
Armin Schrenk
4ff8bbaa62
Merge branch 'develop' into release/1.6.16 2022-12-06 15:44:18 +01:00
Armin Schrenk
1b9480293a
Bump cryptofs 2022-12-06 15:43:25 +01:00
Armin Schrenk
4bd99d2b66
preparing 1.6.16 2022-12-06 15:24:52 +01:00
Armin Schrenk
512500aaef
bump cryptofs version 2022-12-06 11:03:29 +01:00
Armin Schrenk
32399c4a09
Merge pull request #2546 from cryptomator/feature/javafx-jmods
Use OpenJFX jmods in jlink
2022-12-05 23:18:52 +01:00
Armin Schrenk
3016d35c9b
closes #2488 2022-12-02 11:22:50 +01:00
Sebastian Stenzel
33ebc17619
Merge branch 'develop' into fix/2383-tray-icon-refresh 2022-11-30 11:46:36 +01:00
Sebastian Stenzel
99bc4dbdc5 use openjfx jmods instead of jars 2022-11-30 11:16:38 +01:00
Armin Schrenk
a70d8e1567
update nonModularGroupIds 2022-11-17 09:50:39 +01:00
Armin Schrenk
96b7a8df3f
bump dokany-nio-adapter 2022-11-17 09:24:51 +01:00
Edward Chow
d8ed9f854a update pom.xml for integrations-api 1.2.0-beta1 2022-11-13 11:42:41 +11:00
Armin Schrenk
3c5502955a
bump version of dokany-nio-adapter 2022-11-11 15:20:13 +01:00
Sebastian Stenzel
4029f86a0d
reveal OR copy mount point depending on chosen mounter 2022-11-10 14:11:06 +01:00
Sebastian Stenzel
6dac00625c
updated mount API 2022-11-09 15:33:20 +01:00
Armin Schrenk
0f84d0c990
adapt to new APIs 2022-11-07 14:49:56 +01:00
Edward Chow
dc310c009f rename to onBeforeOpenMenu and init local reference in showTrayIcon() 2022-11-01 22:37:11 +11:00
Sebastian Stenzel
7091839f08
Merge pull request #2505 from cryptomator/feature/javafx-19 2022-10-28 22:09:29 +02:00
Sebastian Stenzel
70e5f53009
Merge branch 'develop' into feature/jdk19 2022-10-27 18:13:42 +02:00
Sebastian Stenzel
c79cfe1c9d
Merge branch 'develop' into feature/javafx-19
# Conflicts:
#	pom.xml
2022-10-26 11:43:07 +02:00
Sebastian Stenzel
d619a0cbf4
bump jwt version 2022-10-26 11:40:09 +02:00
Edward Chow
f852ae0392 remove AWT code and relocate to TrayMenuController 2022-10-16 22:26:30 +11:00
Sebastian Stenzel
69641ed3b6
Merge branch 'develop' into feature/jdk19
[ci skip]
2022-10-14 13:55:15 +02:00
Sebastian Stenzel
2399e29d75
update logback 2022-10-12 13:42:11 +02:00
Sebastian Stenzel
76e7a0a7b8
bump OpenJFX to version 19
replaced EasyBind with `ObservableValue.map()` where possible
2022-10-10 10:24:42 +02:00
Sebastian Stenzel
c805a820a4
Merge branch 'main' into develop
[ci skip]
2022-10-06 17:42:00 +02:00
Sebastian Stenzel
b6e381f0bf
apply cryptofs hotfix 2022-10-06 17:37:03 +02:00
Sebastian Stenzel
aef3f4c6e2
prepare 1.6.15 2022-10-06 16:49:12 +02:00