Commit Graph

1349 Commits

Author SHA1 Message Date
Jan-Peter Klein
4de6b83e2f remove RecoverUtil 2025-05-19 14:37:39 +02:00
Jan-Peter Klein
90cbb0c5f6 new recovery package in common 2025-05-19 14:27:05 +02:00
Armin Schrenk
7260d7f9f8 fixes #3847 2025-05-19 12:20:04 +02:00
Jan-Peter Klein
0370fd5848 fix minWidth and minHeight 2025-05-08 11:14:10 +02:00
Armin Schrenk
9503feb9c4 Feature: Use user and system certificate stores on macOS (#3837) 2025-04-29 17:02:14 +02:00
Armin Schrenk
b7fa1ae6d8 Merge branch 'develop' into release/1.16.0
# Conflicts:
#	src/main/java/org/cryptomator/common/vaults/Vault.java
#	src/main/java/org/cryptomator/ui/eventview/EventListCellController.java
#	src/main/java/org/cryptomator/ui/eventview/EventListCellFactory.java
#	src/main/java/org/cryptomator/ui/eventview/EventViewController.java
#	src/main/java/org/cryptomator/ui/eventview/EventViewModule.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
#	src/main/resources/css/dark_theme.css
#	src/main/resources/css/light_theme.css
#	src/main/resources/fxml/eventview.fxml
#	src/main/resources/fxml/vault_detail_unlocked.fxml
#	src/main/resources/fxml/vault_list.fxml
#	src/main/resources/i18n/strings.properties
2025-04-15 11:41:39 +02:00
Armin Schrenk
3a1b0b17d6 fix translations 2025-04-15 11:23:46 +02:00
Armin Schrenk
1d8466a9e3 Feature: Decrypt encrypted file name (#3788)
Closes #2713
2025-04-10 17:44:55 +02:00
Tobias Hagemann
989c349331 Merge tag '1.15.2' into develop
# -----BEGIN SSH SIGNATURE-----
# U1NIU0lHAAAAAQAAAhcAAAAHc3NoLXJzYQAAAAMBAAEAAAIBAKgu9N6lXOixsGNEmzxZhA
# Rc8ABi3MlOHGT30s3zCQEtvbE/j1QXRycgru5n/TZPKiEqZz5OGLM7FG3lNqHTjrQG1jfZ
# rH9JfmTRX9kLWyDmsiKJkB0L19NcCJQKwhkAdcJkbhQHP4bk1o3uMS+M89n6Y0nmUocGrk
# j7yX/79iQn7PQXdDRk7I+p0p1hCMC7fRlhxPwBX8iPOoty9L75ZoteRoWMGoq4T2fhDdUd
# 5ASRKfdVDjUnFrYvI+o8mhXdbzxNLjp5oN9VWQsb+YIkzApcI1+42BT5WABk+3cLlheqPR
# SocNgYdoZZPA1x6Zlzy2gggm33m/uU7gww2iATphdoyXoj1Nv9loMDOaCQUe6s7Fnnn+xH
# hC1fJoCRlrWJ2QjQmZj18KkrXp2/ZNfvLYUIoQVONF40iizb5GJewH00m1ZV+/oAqbJ/W1
# nfLmXJ/ShwACe3hyZFVOaB2582UyTDFCFJL2Bgbiw8y1ayS15+gs9TkFJlAtbpwofPqVB2
# 16iiE8ViFf//J5ommM1S2sHXaPvu1D038OScIGnz0grhnCjzBr3BduW7EYQ6RhVOqMaEUy
# mQiRKIAtfj+6eHgk3IxB3ynReUFQqE3wreE9buA0vrCO4aWEet+qJsg+395K+/l7E6LQOg
# 5rkgcVj9rtFeo4gFBT2AUUSLmHaqpfABAAAAA2dpdAAAAAAAAAAGc2hhNTEyAAACFAAAAA
# xyc2Etc2hhMi0yNTYAAAIAMAXINugL3MrR1dUYQILEttmSOilND0hlz90eGBXuKRcijebq
# TbIwOrTJBPBlHM5aJC1lzBPcfB5Irz0DWc8eg0u2W/vHxtDXP5VL6me6u92Rz6WV73VWMD
# P8otZlMci0n3C5mM8DhrI9Nvg3qthRS2JW5vt3TFA7rL6IiAqsbA/nXWNGZuQwP+tJGCXg
# lWMD9NHaE1mmCcH+im2Vvnhz0y2Q0IEJCN8MDTrOA3ydnmF+YJ1b2QyQFBGrX3TNitZajX
# Uft3Jw5glpSlcaNEZOPR0cMCPBYy0skMUs4ykq4bVTy3I2qASdY3vb4l795OJPrK5FYyed
# ML5Zad7V8yrif0Cy/Ywy1C4TN6ftoEVH6HFEmJTohEY5BjT5qNK5tpmEs/o7z8W2oJa9Su
# G+KMAGe6AS/4ryQ+OQRJXzzFnAQRnR2Ou3iAA2ypsGWmP09Sr+1bb2qRSvy+lybaayfSLQ
# FouTQxecNq5TVfo1PWaGH9lLxd4i3J0PLk6uM8HfkIFimEN8h+4XT/4YXwO1czwun+IWaS
# nD92KIrdoHth+v05f8PpuqCz6odzojO33GfkMU/6Lkp2RgYeHD4eDb2/vyIJUtZHTPwPPJ
# tDybf2GbcDD4F43+fZdz7Q5A4a9DSDHeB6qZoqou6pUttbTneKQn/tq2yVa0TpyUjbGoCA
# QBvT4=
# -----END SSH SIGNATURE-----
# gpg verification failed.

# Conflicts:
#	pom.xml
2025-04-04 18:26:20 +02:00
Armin Schrenk
800aca5207 fix password enter dialog 2025-04-04 16:26:36 +02:00
Armin Schrenk
6a26d95c15 Feature: Event view (#3780) 2025-04-03 18:10:22 +02:00
Jan-Peter Klein
e1cc61037e cleanup 2025-03-23 11:15:36 +01:00
Jan-Peter Klein
1ae951126a refactored key validation 2025-03-21 11:03:24 +01:00
Jan-Peter Klein
6bb8c0d4e7 removed unused fxml and controller
dialog fix
2025-03-19 10:09:55 +01:00
Jan-Peter Klein
087b6162ed recoverType fix and more use of dialogs 2025-03-18 14:25:44 +01:00
Jan-Peter Klein
f9e8031acb Merge branch 'develop' into feature/restore-vaultconfig 2025-03-18 11:53:06 +01:00
Armin Schrenk
61ec3bc465 Merge branch 'feature/event-view' into release/1.16.0
# Conflicts:
#	pom.xml
2025-03-18 11:39:22 +01:00
Armin Schrenk
36dd98127d update to cryptofs 2.9.0-beta2 2025-03-18 11:38:52 +01:00
Armin Schrenk
30862146b0 Merge branch 'feature/decrypt-name' into release/1.16.0
# Conflicts:
#	pom.xml
2025-03-18 11:21:54 +01:00
Armin Schrenk
ba8fb273c7 cleanup 2025-03-18 11:14:38 +01:00
Armin Schrenk
5204a8e356 remove unused icons 2025-03-18 11:10:38 +01:00
Jan-Peter Klein
ebd767595b get cipherCombo while key validation 2025-03-17 18:39:17 +01:00
Armin Schrenk
2d33d02b46 Feature: TouchID [macOS]
Closes #2180
2025-03-17 17:29:39 +01:00
Armin Schrenk
06ddec4b70 more UI refinment:
* only copy decrypted names to clipboard
* indicate in UI
2025-03-17 17:14:52 +01:00
Jan-Peter Klein
6231c5b8b3 restore checkbox and other small ui rearrangements 2025-03-17 16:10:16 +01:00
Armin Schrenk
24e31553fd refine UI:
* align locate/decrypt buttons horizontally
* change to text icons
* dedup code
2025-03-17 12:02:03 +01:00
Jan-Peter Klein
a3b8297e23 recoverykey validate 2025-03-14 13:51:25 +01:00
Armin Schrenk
262f84e8db new design 2025-03-13 16:47:23 +01:00
Armin Schrenk
6d55331ef2 add missing translation key 2025-03-13 10:36:40 +01:00
Armin Schrenk
42269a6057 just a draft 2025-03-12 18:01:06 +01:00
Armin Schrenk
181e45a596 renamed event list item localization keys 2025-03-12 15:27:24 +01:00
Armin Schrenk
401b0afe9f remove unnecessary code 2025-03-12 12:37:06 +01:00
Armin Schrenk
42ec41b991 clean up code 2025-03-12 12:19:27 +01:00
Armin Schrenk
7ec3c5d04f first delete, then write 2025-03-12 11:41:12 +01:00
Armin Schrenk
f0a7379575 hide count if vault is locked 2025-03-12 10:50:36 +01:00
Armin Schrenk
14a025f769 size restrict the eventMap 2025-03-12 10:00:56 +01:00
Armin Schrenk
fbab2df00f add notification marker for new events 2025-03-12 09:38:56 +01:00
Armin Schrenk
fb56b61a75 add exceptionally clause to keychain migration task 2025-03-11 17:14:42 +01:00
Armin Schrenk
c5c3d55658 Merge branch 'develop' into feature/touch-id 2025-03-11 17:08:13 +01:00
Armin Schrenk
48c2d49c86 revert default version string 2025-03-11 17:07:46 +01:00
Armin Schrenk
7a50ba0b43 Merge branch 'develop' into feature/event-view 2025-03-11 17:03:58 +01:00
Armin Schrenk
b2bee99286 Refactor: Out-of-bounds-check (#3778)
fixes #3723, fixes #3722
2025-03-11 16:03:49 +01:00
Armin Schrenk
88d384afdf reduce tooltip show duration 2025-03-07 11:50:53 +01:00
Armin Schrenk
7af82b831f add event count to viewer 2025-03-07 11:50:40 +01:00
Armin Schrenk
a86f42fa44 replace eventList with a eventMap in model to group events 2025-03-07 11:21:23 +01:00
Armin Schrenk
3ba7e9ba00 cleanup 2025-03-06 12:55:12 +01:00
Armin Schrenk
b2250e8ce0 add Tooltip 2025-03-06 12:54:58 +01:00
Armin Schrenk
f2a480c7a0 reworked event cell texts 2025-03-06 12:40:02 +01:00
Jan-Peter Klein
6715ff9f5f introduce RecoverUtil.Types 2025-03-06 09:17:16 +01:00
Armin Schrenk
bda38096e1 fix minor inconsitencies 2025-03-04 12:34:45 +01:00