mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-22 20:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,608 Commits 36 Branches 214 Tags
73da9543550f0356836b38fe72f83a67eede145a
Commit Graph

376 Commits

Author SHA1 Message Date
JaniruTEC
73da954355 Merge branch 'feature/3001-more-error-messages' into feature/2856-folder-mounts-win 
# Conflicts:
# src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
# src/main/resources/i18n/strings.properties
 2023-07-19 23:38:20 +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
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
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
a3c953d437 Refactored decision model 
See: https://github.com/cryptomator/cryptomator/pull/2985#pullrequestreview-1514141146
 2023-07-05 15:49:43 +02:00
JaniruTEC
cca6d475b3 Updated UI 2023-07-03 21:14:12 +02:00
Armin Schrenk
2c2606d6ad Merge pull request #2961 from sschuberth/win-drive-occupied 
Show a dedicated message when mounting to an occupied Windows drive

Fixes #2309
 2023-06-20 18:25:00 +02:00
Sebastian Schuberth
173b1e8386 Show a dedicated message when mounting to an occupied Windows drive 
The error message was restored from 6395f17. Fixes #2309.
 2023-06-16 19:17:30 +02:00
Jan-Peter Klein
d680c5812d cleaned up code and using parameterized tests 2023-06-14 16:10:11 +02:00
Jan-Peter Klein
150dd3e542 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into feature/error-dialog 2023-06-12 13:52:23 +02:00
Cryptobot
be1c5da54e New Crowdin updates (#2931) 
New translations strings.properties

Filipino; Finnish; Hungarian; Slovak;

[ci skip]
 2023-06-07 11:08:14 +02:00
Jan-Peter Klein
0e7a27b2e1 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into feature/error-dialog 2023-05-30 12:06:50 +02:00
Jan-Peter Klein
d82d11feb7 optimized implementation 2023-05-30 12:03:56 +02:00
Cryptobot
2806525397 New Crowdin updates (#2881) 
New translations strings.properties

Bulgarian; Finnish; German; Japanese; Portuguese; Portuguese, Brazilian; Turkish; Ukrainian; 

[ci skip]
 2023-05-30 10:29:07 +02:00
Armin Schrenk
6acda9b13c also adjust styleClass of location label 2023-05-17 18:48:12 +02:00
Armin Schrenk
0af0a9e440 refactor location ui in addVault workflow to new locationPreset framework 2023-05-17 17:21:02 +02:00
Jan-Peter Klein
b10523ea6c init commit 2023-05-09 09:00:56 +02:00
Cryptobot
35b9dadfc2 New Crowdin updates (#2848) 
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
 2023-04-24 17:33:59 +02:00
Armin Schrenk
5f57678edc Merge pull request #2840 from cryptomator/feature/convert-hub-to-local 
Feature: convert hub-based vault to password-based
 2023-04-21 15:31:28 +02:00
Tobias Hagemann
864454e6fc updated strings 
[ci skip]
 2023-04-18 16:03:05 +02:00
Armin Schrenk
dc9b39202f rename classes 2023-04-18 14:34:48 +02:00
Armin Schrenk
a24cd1ba7f Apply suggestions from code review 
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
 2023-04-14 16:47:45 +02:00
Tobias Hagemann
2ba0d963ec updated insets 
[ci skip]
 2023-04-13 16:12:08 +02:00
Cryptobot
6052c0589e New Crowdin updates (#2800) 
New translations strings.properties

Belarusian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Danish; Dutch; French; German; Greek; Hebrew; Hungarian; Italian; Japanese; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Romanian; Russian; Slovak; Spanish; Swahili, Tanzania; Swedish; Turkish; 

[ci skip]
 2023-04-04 18:15:07 +02:00
Armin Schrenk
3a50c32e50 rework convert button logic 2023-04-04 12:42:23 +02:00
Armin Schrenk
65eca31d26 integrate internationalization 2023-04-04 12:17:22 +02:00
Armin Schrenk
3462e0b540 further design adjustment 2023-04-03 10:42:25 +02:00
Armin Schrenk
a1a5fd3609 adjust design 2023-03-30 17:35:32 +02:00
Armin Schrenk
6c11cc8f1d complete workflow 2023-03-30 16:47:30 +02:00
Armin Schrenk
2b391a6ee3 Merge branch 'develop' into feature/convert-hub-to-local 2023-03-30 15:54:20 +02:00
Armin Schrenk
dfe17569e1 Merge pull request #2789 from cryptomator/feature/2786-only-restart-macfuset 
Feature: Only require app restart if switching between macFUSE and FUSE-T
 2023-03-30 11:23:09 +02:00
Tobias Hagemann
771468c8c6 refactored macfuse/fuse-t specific workaround to a generic fuse workaround 2023-03-29 16:16:04 +02:00
Armin Schrenk
ec7d6eafec add new password screen for convert hub vault flow 2023-03-24 18:11:39 +01:00
Armin Schrenk
28bb2ff9b1 add stub for vault conversion (hub to local) 2023-03-24 17:22:05 +01:00
Armin Schrenk
3cf1b829b8 make recovery key ui validation reusable 2023-03-20 21:40:16 +01:00
Armin Schrenk
6e4e9cd261 Merge branch 'develop' into feature/hub-local-access 2023-03-20 20:43:34 +01:00
Cryptobot
16d677c40f New Crowdin updates (#2766) 
New translations strings.properties

Belarusian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; French; German; Hebrew; Norwegian Bokmal; Russian; Swahili, Tanzania; Turkish; 

[ci skip]
 2023-03-15 13:47:22 +01:00
Armin Schrenk
58ed48b097 UI: 
* remove restart notice for volume type
* only show restart label, when switching between macFUSE and FUSET
 2023-03-13 11:17:56 +01:00
Cryptobot
5bf38a328c New Crowdin updates (#2743) 
New translations strings.properties

Arabic; Belarusian; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; French; German; Greek; Hebrew; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Norwegian Bokmal; Norwegian Nynorsk; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Slovak; Spanish; Swahili, Tanzania; Swedish; Tamil; Turkish; Ukrainian; Vietnamese; 

[ci skip]
 2023-03-07 11:49:50 +01:00
Armin Schrenk
1365efab3f use recommended notation of unit prefixes 2023-03-06 15:54:43 +01:00
Cryptobot
4d5c6ca29a New Crowdin updates (#2712) 
New translations strings.properties

Danish; German; Hebrew; 

[ci skip]

Closes #2724
 2023-03-03 16:02:09 +01:00
Cryptobot
3f2b5ccde9 New Crowdin updates (#2698) 
New translations strings.properties

Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; French; Japanese; 

[ci skip]
 2023-03-01 11:42:57 +01:00
Armin Schrenk
4fc07c27b3 Merge branch 'develop' into feature/hub-local-access 2023-02-27 15:35:40 +01:00
Cryptobot
ca3157cc70 New Crowdin updates (#2695) 
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
 2023-02-24 14:15:50 +01:00
Armin Schrenk
ec1d25bf65 Merge branch 'develop' into feature/hub-local-access 2023-02-23 21:10:03 +01:00
Armin Schrenk
7aa554498b move new password files to changepassword package 2023-02-23 13:00:51 +01:00
Armin Schrenk
85ac3c244d rename forgetPassword package 2023-02-23 12:55:30 +01:00