Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-11-27 05:50:26 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
4,186 Commits 23 Branches 187 Tags 36 MiB
94c53989b1
Commit Graph

4186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Schrenk
94c53989b1
MountOptions window: Reset to auto mount, if no dir selected 2023-01-13 11:27:30 +01:00
Armin Schrenk
a72ea1b9f5
move mount prepartions to own class 2023-01-13 11:20:23 +01:00
Armin Schrenk
6395f17736
Handle illegelArgumentException when setting custom mountpoint 2023-01-12 17:21:54 +01:00
Armin Schrenk
5c61944757
fix minor ui bugs 2023-01-12 12:53:58 +01:00
Armin Schrenk
c641695a40
migrate 1.6.x vault settings on-the-fly 2023-01-12 12:11:03 +01:00
Armin Schrenk
d93ef2e905
Reinitiate force lock 2023-01-11 16:40:14 +01:00
Armin Schrenk
8b9377cf4e
only fix custom mount flags, if explicitly desired. Otherwise use the ones provided by mount service 2023-01-11 16:35:12 +01:00
Armin Schrenk
991b03e000
use function paramter, not instance variable 2023-01-11 16:21:49 +01:00
Armin Schrenk
73d8c4098e
resolve TODOs 2023-01-11 16:18:05 +01:00
Armin Schrenk
6a52d15510
Show mountpath in reveal button 2023-01-11 16:01:59 +01:00
Armin Schrenk
d07b1b96dd
Use first available mount provider if none is selected or selected is not present 2023-01-11 16:01:51 +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
6fe2d73c52
copy uri to clipboard when using fallback mounter 2023-01-11 15:59:39 +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
Tobias Hagemann
0d49c60d4d
reverted 1a6258eb17 2023-01-09 11:32:11 +01:00
Tobias Hagemann
1807888860
updated sponsors 
[ci skip]
 2023-01-05 11:16:22 +01:00
Tobias Hagemann
be7ac50928
added new app icon for macos, fixes #2517 2023-01-04 16:32:40 +01:00
Julian Raufelder
9182c415eb
Hello 2023 🎉 2023-01-04 13:35:58 +01:00
Armin Schrenk
1a6258eb17
revert eea568ca4e and e2898f0c8b 2023-01-04 12:52:16 +01:00
Armin Schrenk
9c0c6a91fb
Merge pull request #2580 from jacob-willden/develop 
Add more info to Migration Screen
 2023-01-03 16:47:18 +01:00
Armin Schrenk
53436520c9 fix using the wrong property 2023-01-03 12:38:18 +01:00
Armin Schrenk
fd5aeaf90a Merge branch 'develop' into feature/mount-setting-per-vault 2023-01-02 13:47:30 +01:00
Armin Schrenk
f3fcfc913b Remove unused class 2023-01-02 12:10:46 +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
6704bb1f8c
Merge pull request #2612 from cryptomator/feature/2597-no-keychain-dialog 
Feature: Show dialog for hub vaults, if keychain is disabled'

Closes #2597
 2022-12-30 11:32:40 +01:00
Armin Schrenk
48d1938b99
Refine dialog text 2022-12-30 11:19:37 +01:00
Armin Schrenk
6199277002
Add Button to open preferences 2022-12-29 18:26:13 +01:00
Armin Schrenk
9fefe8e462
Show info dialog when keychain is deactivated 2022-12-29 18:20:46 +01:00
Armin Schrenk
5fcd53be18
load device key before showing UI to prevent uncatched failure of UI loading 2022-12-29 18:17:47 +01:00
Jacob Willden
7147636428 Switch term for new vault migration dialog 2022-12-21 18:56:17 -07:00
Jacob Willden
690bd833e8 Add more info to Migration Screen 2022-12-16 13:28:57 -07:00
VsevolodGolovanov
1e12590681
Update src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java 
Co-authored-by: Tobias Hagemann <tobias.hagemann@gmail.com>
 2022-12-15 13:34:52 +04:00
Tobias Hagemann
eea568ca4e
GCM is explicitly ready! 2022-12-14 22:27:34 +01:00
Armin Schrenk
8009205da7
Merge branch 'main' into develop 
# Conflicts:
#	pom.xml
 2022-12-14 20:07:24 +01:00
Armin Schrenk
c0f73a2802
Merge branch 'hotfix/1.6.17' 2022-12-14 20:06:35 +01:00
Armin Schrenk
8e902877a3
Update dependency-check plugin and exclude false positive 
(cherry picked from commit ebcd0adf78)
 2022-12-14 20:06:23 +01:00
Armin Schrenk
fd76c89393
update metainfo 2022-12-14 20:02:12 +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
Tobias Hagemann
e2898f0c8b
GCM is ready! 2022-12-14 17:36:06 +01:00
Tobias Hagemann
cf2b236df5
added tray icons for unlocked state 2022-12-14 17:28:59 +01:00
Tobias Hagemann
819fa803f3
cleaned up tray icons 2022-12-14 16:47:07 +01:00
Armin Schrenk
980e2b184b
use correct tag name for gh release in debian workflow 2022-12-13 12:48:29 +01:00
Armin Schrenk
0d6d7b0dd6
directly use inputs object 2022-12-09 16:56:45 +01:00
Armin Schrenk
9dfd8adcce
revert 0725a63b09 and fix workflow 2022-12-09 16:56:02 +01:00
Armin Schrenk
433eecc6a8
adjust matching rules for version type detection 
(cherry picked from commit cd358916260e713d4119c20b1bcb5b448a017365)
 2022-12-09 16:50:39 +01:00
Armin Schrenk
36ed4554b2
Fixes #2570 
Dabian build: Make libffi7 a runtime dependency and preload it.
 2022-12-09 15:12:04 +01:00
Armin Schrenk
63a89b5bcf
adjust post-release and win-exe workflow 2022-12-08 17:50:31 +01:00
Armin Schrenk
de46b91420
use directly inputs object 2022-12-08 13:59:55 +01:00