mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-24 21:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,176 Commits 36 Branches 214 Tags
74fc77ab8dccd331e48ea7dabd2ec5e01fdd2bcd
Commit Graph

6176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Schrenk
0bcbf9a13a add migration code and synchronize keychain edits 2025-02-25 16:32:38 +01:00
Armin Schrenk
e3073a3613 adjust wording for autoLock feature [skip ci] 2025-02-25 15:38:50 +01:00
Armin Schrenk
3333dc7f22 Fix not appearing removeCert dialog 2025-02-25 11:52:00 +01:00
Jan-Peter Klein
895614353e improve RecoverUtil and determineVaultState 2025-02-21 23:24:34 +01:00
Jan-Peter Klein
676c507a50 add RecoverUtil and some ui changes 2025-02-21 19:43:09 +01:00
Jan-Peter Klein
5f4fd92b1d Merge branch 'develop' into feature/restore-vaultconfig 2025-02-19 19:49:35 +01:00
Julian Raufelder
12ec6fbec8 Change /access-token deviceId header name to Hub-Device-ID 2025-02-19 14:25:34 +01:00
Armin Schrenk
43fc976ad7 reduce #3311 to touchID 2025-02-19 11:49:59 +01:00
Armin Schrenk
034278c0a0 changes: 
* implement reveal conflictResolved
* removed showVault context menu entry
* cleanup
 2025-02-19 11:27:39 +01:00
Julian Raufelder
92b3a9e1bd Merge pull request #3752 from cryptomator/feature/add-device-id-during-hub-unlock 
Send DeviceId to Hub during vault key retrieval
 2025-02-19 09:51:39 +01:00
Julian Raufelder
fc7169f2a0 Send DeviceId to Hub during vault key retrieval 
See https://github.com/cryptomator/hub/pull/320
 2025-02-19 09:05:13 +01:00
Armin Schrenk
c39710ede0 show event specific context menu 2025-02-18 18:32:06 +01:00
Armin Schrenk
cc0b6aed15 Update org.cryptomator.Cryptomator.metainfo.xml 
* adjust screenshot captions
* reorder screenshots
* add keywords
 2025-02-18 16:52:31 +01:00
Armin Schrenk
f8a83c9cc8 scope eventListcell factory 2025-02-18 15:32:34 +01:00
Armin Schrenk
43ce64f01e adjust styling 2025-02-18 11:44:48 +01:00
mindmonk
d585a03f76 Merge pull request #3699 from cryptomator/feature/vault-scheme-tag 
Add lastKnownKeyLoader entry to VaultSettings
 2025-02-17 17:35:47 +01:00
Armin Schrenk
f953be6237 Merge branch 'develop' into feature/event-view 2025-02-17 17:12:35 +01:00
Armin Schrenk
e81bbe197b if mainWindow is closed without tray menu, terminate app 2025-02-17 16:46:25 +01:00
Armin Schrenk
738fa4da12 cleanup 2025-02-17 16:08:09 +01:00
dependabot[bot]
9a08dcc46d Bump org.owasp:dependency-check-maven (#3748) 2025-02-17 10:04:30 +00:00
Armin Schrenk
74ef8d915d make eventView independent, but singleton window 2025-02-14 17:26:25 +01:00
Armin Schrenk
025a7a5582 add contextMenu to eventListCell 2025-02-14 17:11:43 +01:00
Armin Schrenk
3b2ddcf98d style the eventlist cell more 2025-02-14 16:47:15 +01:00
Armin Schrenk
c10fc0ee5b Update README.md 
For build badge use develop branch.
 2025-02-14 11:56:55 +01:00
Armin Schrenk
aaa37e2c7a Feature: Add UTM parameters to download uri (#3735) 
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
 2025-02-14 11:55:22 +01:00
Armin Schrenk
7af7c920e3 use same listCell factory pattern as in vault list 2025-02-14 11:54:25 +01:00
Armin Schrenk
a4f79fb98a unify naming 2025-02-14 11:41:35 +01:00
Armin Schrenk
f429f2d3e7 rename method 2025-02-14 10:51:48 +01:00
Armin Schrenk
4f6e091c13 first proper design draft 2025-02-13 16:58:05 +01:00
Jan-Peter Klein
2df779f7ab introduce isMasterkeyFileVault() 2025-02-13 15:44:10 +01:00
Jan-Peter Klein
5b9d9150c5 remove extra try catch block 2025-02-13 15:39:06 +01:00
Jan-Peter Klein
f0aaec2058 comparison reversed 2025-02-13 15:15:29 +01:00
Jan-Peter Klein
4adc4a9175 removed unused StringBinding 2025-02-13 15:03:14 +01:00
Armin Schrenk
5a97060fac make the list synchronized 2025-02-13 11:06:48 +01:00
Armin Schrenk
db96074119 replace AppEvent by UpdateEvent and emit it on available update 2025-02-12 11:12:40 +01:00
Jan-Peter Klein
7ecc10bc79 removed setVaultScheme method; lastKnownKeyLoader is now set within the create method 2025-02-12 10:35:21 +01:00
Armin Schrenk
44fe4a6f8a displayable event view window 2025-02-11 17:37:04 +01:00
Jan-Peter Klein
76a4ef50cb improve exception handling 2025-02-11 16:21:53 +01:00
Armin Schrenk
ca2f80024a impl draft 2025-02-11 15:38:18 +01:00
Armin Schrenk
dcd7077b08 Feature: readd out of bounds check (#3729) 
references #3091
 2025-02-11 15:24:36 +01:00
Armin Schrenk
31482d7d18 [skip ci] update ide files 2025-02-11 12:37:45 +01:00
Armin Schrenk
5ef666154e use correct height in css [skip ci] 2025-02-11 10:16:34 +01:00
Armin Schrenk
a810eff797 make menu buttons in vault list appear clickable 2025-02-10 18:29:57 +01:00
Jan-Peter Klein
664158eb84 add isHubVault method to KeyLoadingStrategy 2025-02-10 18:09:03 +01:00
Armin Schrenk
6b43881909 [skip ci] update screenshot url in metainfo file 2025-02-10 17:08:03 +01:00
Jan-Peter Klein
126004b1f8 improve error handling 2025-02-10 12:58:54 +01:00
Jan-Peter Klein
ba34cfa9d5 renamed to lastKnownKeyLoader 2025-02-10 12:07:25 +01:00
Armin Schrenk
03b4ad85ef [skip ci] Merge branch 'main' into develop 2025-02-05 16:22:09 +01:00
Armin Schrenk
1abfcd495f Merge branch 'release/1.15.1' 1.15.1 2025-02-05 16:19:41 +01:00
Armin Schrenk
69964a80f1 finalize 1.15.1 2025-02-05 16:18:59 +01:00