mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-19 11:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,766 Commits 36 Branches 214 Tags
9be00a2693776bf4ccfff148e4e4f660a7da618e
Commit Graph

4766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jan-Peter Klein
bc361ea592 added ui elements for update reminder 2023-07-10 13:04:07 +02:00
Ralph Plawetzki
3d0741f4d2 Use version 1.3.3 of appindicator-gtk3-java 2023-07-09 19:48:52 +02:00
Ralph Plawetzki
b75459fbc6 Revert "Find native libraries on the system" 
This reverts commit 58bb266085.
 2023-07-09 19:47:52 +02:00
Jan-Peter Klein
2202c91564 rearranged view 
added pencil icon
optimized code
cleaned up strings.properties
 2023-07-07 16:22:53 +02:00
JaniruTEC
e484813233 Added check for deletion of hideaway 2023-07-07 16:19:16 +02:00
Jan-Peter Klein
f817bc5378 implement requested changes from PR review 2023-07-06 11:03:34 +02:00
JaniruTEC
c30c90d2c3 Merge pull request #2985 from cryptomator/feature/2981-differ-options-preferences 
Fix 2981
 2023-07-05 16:27:55 +02:00
Jan-Peter Klein
09b638eafa pr mentioned changes implemented 2023-07-05 16:19:11 +02:00
JaniruTEC
91de0c1813 Added called to #showMainWindow 
See: https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252863161
 2023-07-05 15:50:35 +02:00
JaniruTEC
a3c953d437 Refactored decision model 
See: https://github.com/cryptomator/cryptomator/pull/2985#pullrequestreview-1514141146
 2023-07-05 15:49:43 +02:00
JaniruTEC
743da019f9 Cleaned up UnlockInvalidMountPointController 
See:
https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252868655
https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252874468
 2023-07-05 15:26:19 +02:00
Jan-Peter Klein
2c506fcc97 rearranged view elements an renamed advancedSettings to expertSettings 2023-07-05 13:17:10 +02:00
Jan-Peter Klein
dd71df8382 Merge branch 'develop' into feature/custom-shortening-threshold 2023-07-05 11:55:51 +02:00
Armin Schrenk
2c984ad405 use system property path.separator and fix failing unit test on windows 2023-07-04 16:31:28 +02:00
JaniruTEC
171b0e61ad Finished implementation 2023-07-04 16:14:08 +02:00
JaniruTEC
e5047c242c Moved subcomponent-bindings 
Moved bindings for VaultOptionsComponent and HealthCheckComponent from MainWindowModule to FxApplicationModule
 2023-07-04 15:35:23 +02:00
JaniruTEC
131145e8b8 Merge branch 'develop' into feature/2981-differ-options-preferences 2023-07-04 14:00:44 +02:00
JaniruTEC
11a0136cb9 Fixed run configurations 
See: #2982
 2023-07-04 13:55:42 +02:00