mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-19 13:46:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,115 Commits 30 Branches 215 Tags
52fc94ca0158732c4b79236ca490453d59ff6cdf
Commit Graph
1139 Commits
Author SHA1 Message Date
Armin SchrenkandGitHub 303f84166f Merge pull request #2101 from kevinstsauveur/1583-vault-state-in-title-tray 
Show vault locked/unlocked state in the vault title in the tray menu

Closes #1583
 2022-03-22 12:45:21 +01:00
Armin Schrenk 9e594ea127 Fix not showing dir picker dialog when path does not exist 2022-03-22 12:44:06 +01:00
Kevin St-Sauveur 538cac3749 Changing prefix marker in unlocked vault name in tray menu 2022-03-21 15:37:32 -04:00
Sebastian Stenzel 4a3d579b76 changed button title as suggested in review 2022-03-21 14:01:35 +01:00
Sebastian Stenzel 6bad74720f Merge branch 'develop' into feature/simplified-workflow-results 2022-03-21 13:56:24 +01:00
Armin Schrenk d3e9239531 simplify name of test file for location check on vault creation 2022-03-16 15:24:55 +01:00
Kevin St-Sauveur 79e6a4cd48 Modify vault title when unlocked 2022-03-14 02:29:25 -04:00
Sebastian Stenzel ad6d5bfae9 resolved class name conflict 2022-03-07 17:42:56 +01:00
Sebastian Stenzel a404740ceb Updated to integrations-api 1.1.0-beta2 2022-03-07 17:35:48 +01:00
Armin SchrenkandSebastian Stenzel 9b001b5071 Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com> 2022-03-03 17:45:21 +01:00
Armin SchrenkandSebastian Stenzel 14dc026354 Cleanup 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2022-03-02 17:24:54 +01:00
Armin Schrenkandsonarcloud fba0df10f9 Resolve code smells and a bug 
Co-authored-by: sonarcloud <sonarcloud@users.noreply.github.com>
 2022-03-02 15:28:01 +01:00
Armin Schrenk f148973bef fix wrong visibillity 2022-03-02 14:50:26 +01:00
Armin Schrenk 4f4c992493 Further improvements: 
* make PARENT_NO_MOUNTPOINT preps system agnostic
* add unit tests for cleanup
 2022-03-02 14:40:27 +01:00
Armin Schrenk e15b68fc9b Refactor winfsp mount preps and add unit tests 2022-02-28 18:54:01 +01:00
Armin Schrenk 3ff3b1c63e refactor controller: 
* fix vault options UI not showing
* rename from "get" to "is" methods in vault options controller
 2022-02-28 13:03:36 +01:00
Armin Schrenk 55d1a8e935 Allow custom mount point for winfsp 2022-02-25 13:21:45 +01:00
Sebastian Stenzel 9f7442c1c0 read clientId from vault config 2022-02-23 12:49:39 +01:00
Sebastian Stenzel 64abbc8205 Merge branch 'develop' into feature/hub 
# Conflicts:
#	.github/workflows/release.yml
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
 2022-02-18 09:38:25 +01:00
Sebastian Stenzel 165f190004 read device registration url from vault config 2022-02-18 09:13:33 +01:00
JaniruTEC 12a21bbb71 Added "--version" (short: "-v") 2022-02-17 02:39:48 +01:00
JaniruTECandGitHub da2d647361 Merge pull request #2013 from cryptomator/feature/1888-existing-drive-letter-error 
Added error message if user tries to mount to occupied drive
 2022-01-30 01:38:16 +01:00
JaniruTEC 1641a06d65 Renamed NO_PARENT_NO_MOUNT_POINT to UNUSED_ROOT_DIR in MountPointRequirement 2022-01-30 01:35:02 +01:00
KarlKeu00andGitHub a9846744fe Update JavaFX to 17.0.2 (#2031) 
Updating JavaFX inside Maven to 17.0.2 to fix JDK-8275723. This is only relevant for development on a Mac with an M1 processor.
 2022-01-21 13:16:06 +01:00
Sebastian Stenzel e1a72c41a5 remove unused imports 2022-01-19 20:01:48 +01:00
Sebastian Stenzel 4d4098e0e0 cleanup 2022-01-19 19:49:33 +01:00
Sebastian Stenzel d52e59d7a4 dedup by setting title when setting the scene 2022-01-19 19:08:54 +01:00
Sebastian Stenzel 9440fb186f Merge branch 'develop' into feature/simplified-workflow-results, 
solving conflict with 5509033

# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java
 2022-01-19 17:35:04 +01:00
Sebastian Stenzel 9856792921 replaced UserInteractionLock with CompletableFuture in LockWorkflow 2022-01-19 17:21:32 +01:00
JaniruTEC 080ddbbb01 Applied changes from code review. 2022-01-18 02:25:25 +01:00
httpjamesmandGitHub f1fdd7960c Update copyright years from 2021 to 2022 to reflect the new year (#2015) 2022-01-10 10:01:07 +01:00
JaniruTEC b7902ad8fd Merge branch 'develop' into feature/1888-existing-drive-letter-error 2022-01-09 00:35:32 +01:00
Armin Schrenk 7486fa2167 update Third parties license file 2022-01-04 16:35:42 +01:00
Armin Schrenk 550903325d Add vault name in unlock window titles 2022-01-04 16:35:09 +01:00
Sebastian Stenzel 806ffe704c convert Dagger modules to interfaces 2021-12-16 17:09:25 +01:00
Sebastian Stenzel 6ca87d13f5 renamed class 2021-12-16 17:01:56 +01:00
Sebastian Stenzel 983a4d0b0f move masterkey selection to subcomponent 
and use CompletableFuture instead of UserInteractionLock + AtomicReference
 2021-12-16 17:00:49 +01:00
Sebastian Stenzel e95853deac make test public, fixing InaccessibleObject error in maven build 2021-12-16 16:46:57 +01:00
Sebastian Stenzel d72d9f533c Replace CharBuffer and char[] instances by destroyable Passphrase 2021-12-16 16:41:07 +01:00
Sebastian Stenzel 85a5146d4b wipe pw before losing reference 
[ci skip]
 2021-12-16 13:59:10 +01:00
Sebastian Stenzel 0bece0f591 move passphrase entry to subcomponent 
and use CompletableFuture instead of UserInteractionLock + AtomicReference
 2021-12-16 13:56:59 +01:00
Armin Schrenk 196521bfd0 Merge tag '1.6.5' into develop 
1.6.5

# Conflicts:
#	pom.xml
 2021-12-16 13:33:40 +01:00
Armin Schrenk 9775eaa2a8 bump logback to close possible vulnerability 2021-12-16 13:31:38 +01:00
Sebastian Stenzel abc0f952e0 closing the window will cancel implicitly 2021-12-15 17:32:11 +01:00
Sebastian Stenzel e6f43d1f05 no need to run code in ui thread 2021-12-15 17:31:08 +01:00
Sebastian Stenzel 25b9722019 Use CompletableFuture instead of UserInteractionLock + AtomicReference 2021-12-15 17:19:59 +01:00
Sebastian Stenzel 157bef5df6 close dialog after successful device registration (to be improved lol) 2021-12-15 17:19:00 +01:00
Sebastian Stenzel ef281f810f register device via rest api 2021-12-14 17:35:24 +01:00
JaniruTEC 46a3a4fc11 Added error message if user tries to mount to occupied drive. 
Fixes #1888
 2021-12-13 00:46:18 +01:00
Armin SchrenkGitHubSebastian Stenzel
 		921dd8fe67 Add query to redirection to provide more context in the frontend (#1973) 
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
 2021-12-10 13:42:37 +01:00