mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-06-09 21:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,498 Commits 30 Branches 215 Tags
develop
Commit Graph

6498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Schrenk c6ab05979c cleanup [ci skip] 2023-07-19 16:33:40 +02:00
Armin Schrenk 2c8d5d3d5d update ci script 2023-07-19 16:30:08 +02:00
Armin Schrenk b76a311ddc Replace winfsp-uninstaller by downloadlink 2023-07-19 16:24:44 +02:00
JaniruTEC 879e6dcab7 Updated error message 
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1268035540
 2023-07-19 16:10:48 +02:00
JaniruTEC f9f8a6b357 Added unit tests for MountWithinParentUtil 2023-07-19 15:39:14 +02:00
JaniruTEC 3ea6da3c6d Fixed thrown exception 2023-07-19 15:36:23 +02:00
JaniruTEC bb0b1b3592 Cleaned up merge 2023-07-19 15:36:22 +02:00
JaniruTEC 0b6782d44b Refactored error message to use ObservableValues 2023-07-18 20:11:24 +02:00
Armin Schrenk bd932b1067 Fixes #3021 2023-07-18 17:06:03 +02:00
Armin Schrenk 238aaeb5a0 bump integrations-api to stable version 2023-07-18 12:40:06 +02:00
Jan-Peter Klein ade277daf4 changed naming pattern and wording 2023-07-18 10:29:14 +02:00
Jan-Peter Klein 14776fc571 refactored UpdateReminderComponent.Builder to Factory 2023-07-17 15:40:11 +02:00
Jan-Peter Klein c18f489e9d Merge branch 'develop' into feature/update-reminder 2023-07-17 15:32:25 +02:00
Jan-Peter Klein bfc1e25335 some code cleanup 2023-07-17 12:23:23 +02:00
Jan-Peter Klein 4c2e6088a9 reformat code and optimized imports 2023-07-17 11:26:59 +02:00
JaniruTEC ed6f1ad8d1 Merge branch 'feature/3001-more-error-messages' into feature/2856-folder-mounts-win 
# Conflicts:
#	src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
 2023-07-14 23:05:48 +02:00
JaniruTEC c3ac043c68 Removed MountPointPreparationException 
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1263572178
 2023-07-14 21:13:11 +02:00
Armin Schrenk 315bf0d51f Format confirmation dialog 2023-07-14 16:00:49 +02:00
JaniruTEC a90e75ceba Renamed exceptions 
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1263563166
 2023-07-14 15:09:36 +02:00
JaniruTEC aa2e63acb0 Added @PropertyKey 
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1263039593
 2023-07-14 14:58:56 +02:00
JaniruTEC a259d554fa Removed unused import 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1263556873
 2023-07-14 14:53:00 +02:00
Armin Schrenk 4cdbe50eb6 adjust to new winfsp-uninstaller exe 2023-07-13 17:29:50 +02:00
JaniruTEC f5e035fa3b Applied suggestions from code review 
Updated log message
Replaced caught exception

See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1262297316
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1262298832
 2023-07-13 15:22:21 +02:00
Armin Schrenk f1d4bd4cd4 Closes #2989 2023-07-13 12:22:46 +02:00
mindmonk 2a0e0738be Merge pull request #2987 from cryptomator/feature/custom-shortening-threshold 
Feature/custom shortening threshold
 2023-07-13 12:15:07 +02:00
Ralph Plawetzki 9e25d0fcc0 Define property in a single line 2023-07-13 06:43:32 +02:00
JaniruTEC 96ebb67085 Applied suggestions from code review 
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1260955250
 2023-07-12 19:17:37 +02:00
Ralph Plawetzki 3fbc5e84e3 Define property in a single line 2023-07-12 19:16:04 +02:00
Jan-Peter Klein 1fec9781bf Merge branch 'develop' into feature/custom-shortening-threshold 2023-07-12 16:07:03 +02:00
Jan-Peter Klein 886c69f298 reordered ui elements and added expert settings section to strings.properties 2023-07-12 16:04:29 +02:00
JaniruTEC 614756c740 Added message for HideawayAlreadyExistsException 2023-07-11 22:35:08 +02:00
JaniruTEC 2a9d1e3fba Added messages for MountPointCouldNotBeClearedException and MountPointNotEmptyDirectoryException 2023-07-11 22:33:27 +02:00
JaniruTEC 9361a75cd8 Refactored UnlockInvalidMountPointController to use improved Exceptions 2023-07-11 21:53:18 +02:00
JaniruTEC becc5e316a Made interaction between Unlock logic & UI more consistent 2023-07-11 21:53:18 +02:00
JaniruTEC 08a1e1ec7d Added/Refactored exceptions to account for more cases 2023-07-11 21:53:18 +02:00
JaniruTEC 12f5f41968 Redefined IllegalMountPointException and MountPointPreparationException 2023-07-11 21:53:18 +02:00
JaniruTEC 58c7774e0d Added arg3 to FormattedLabel 2023-07-11 21:50:52 +02:00
Ralph Plawetzki da8410842b Change showTrayIcon to true for all Linux builds 2023-07-11 19:56:22 +02:00
Ralph Plawetzki 1cae1a5f2f Fix setting TRAYICONSDIR 2023-07-11 19:25:37 +02:00
Jan-Peter Klein df31b214f5 changed button wording from "Not now" to "Ask Me Later" 2023-07-11 15:23:50 +02:00
Jan-Peter Klein 25474ce014 changed wording and window size 2023-07-11 14:53:36 +02:00
Jan-Peter Klein 5f62f038d5 removed message below the input field and inserted in the invalid message 2023-07-11 14:41:43 +02:00
Jan-Peter Klein eebba45909 added comment to explain code that sets shorteningThreshold to 0 
removed unnecessary introduction text
 2023-07-11 14:10:26 +02:00
Armin Schrenk ead0f0fae1 add exe for winfsp uninstallation and include in burn bundle 2023-07-11 09:41:54 +02:00
JaniruTEC 5e2e8c35d5 Added cleanup of junctions on Win 2023-07-10 17:38:30 +02:00
JaniruTEC 328f2f89a8 Removed unnecessary checks 2023-07-10 16:01:39 +02:00
JaniruTEC 92b77baf40 Improved handling of existing hideaways 2023-07-10 15:58:38 +02:00
Jan-Peter Klein 982e88d1c5 changed icon to question mark 2023-07-10 15:47:12 +02:00
Jan-Peter Klein 632d39bc9f added lastUpdateCheck to settings and integrated check in FXApplication start 2023-07-10 14:50:06 +02:00
Jan-Peter Klein f25afb720f optimized isValidShorteningThreshold method and renamed DEFAULT_SHORTENING_THRESHOLD to MAX_SHORTENING_THRESHOLD 2023-07-10 13:14:58 +02:00