mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-19 05:36:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,967 Commits 30 Branches 215 Tags
76d499596fef3c15b65b8331f757c6afff2b7aa6
Commit Graph
244 Commits
Author SHA1 Message Date
Jan-Peter Klein 76d499596f Merge branch 'develop' into feature/vault-volume-type 2023-10-30 14:33:32 +01:00
Jan-Peter Klein 1818344c49 different labeling for volume type option in general volume preferences and vault options 2023-10-30 14:33:01 +01:00
CryptobotandGitHub 4eee66b0ef New Crowdin updates (#3128) 
New translations strings.properties

Arabic; Belarusian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Czech; Danish; Dutch; Filipino; Finnish; French; German; Greek; Hebrew; Hungarian; Italian; Japanese; Korean; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Romanian; Russian; Slovak; Spanish; Swahili, Tanzania; Swedish; Turkish; Ukrainian; Vietnamese; 

[ci skip]
 2023-10-30 10:39:04 +01:00
Tobias Hagemann 88ad3cd724 Merge branch 'develop' into feature/new-hub-keyloading 2023-09-20 14:38:13 +02:00
CryptobotandGitHub e858280f30 New Crowdin updates (#3110) 
New Crowdin updates (#3110)

New translations strings.properties

Bulgarian; Chinese Traditional; 

[ci skip]
 2023-09-20 11:05:33 +02:00
CryptobotandGitHub 18b6484731 New Crowdin updates (#3095) 
New translations strings.properties

Arabic; Chinese Simplified; Filipino; German; Japanese; Norwegian Bokmal; Polish; Portuguese, Brazilian; Spanish; Swedish; Ukrainian; 

[ci skip]
 2023-09-11 09:46:49 +02:00
Tobias Hagemann 08887f1147 Merge branch 'develop' into feature/new-hub-keyloading 2023-09-06 14:18:11 +02:00
CryptobotandGitHub 721cdf20e7 New Crowdin updates (#3071) 
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; 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-09-01 16:13:46 +02:00
Jan-Peter Klein ef24141713 new stage titles for addNewVault and addExistingVault 2023-08-23 13:36:41 +02:00
Jan-Peter Klein 820d4ff573 disabled right click on add vault button and enhanced naming 2023-08-23 13:17:38 +02:00
Tobias Hagemann 8a7a5eeea1 fixed grammar 2023-08-16 17:17:27 +02:00
CryptobotandGitHub 9b9a354902 New Crowdin updates (#3029) 
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; 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-08-09 15:26:10 +02:00
Sebastian Stenzel f48963a6d0 Merge branch 'develop' into feature/new-hub-keyloading 
# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
 2023-08-09 15:26:03 +02:00
Jan-Peter Klein f91a854b3e removed more info hyperlink and fixed ui by moving isLoadingHttpResponse.set(true) 2023-08-07 14:56:01 +02:00
Jan-Peter Klein 4c819807de implemented 'More Info...' hyperlink functionality 2023-08-04 16:12:01 +02:00
Jan-Peter Klein fa3e0efd12 init commit 
added new string properties
added ui elements for user permission to look up error solutions in database
modified ErrorController for permission handling
 2023-08-03 12:53:44 +02:00
Sebastian Stenzel 6ce34efb52 Merge branch 'develop' into feature/new-hub-keyloading 2023-07-28 15:23:00 +02:00
JaniruTECandGitHub 221b4e85bc Merge pull request #2996 from cryptomator/feature/2856-folder-mounts-win 
Improve handling of folder-mounts on Win
 2023-07-25 15:51:18 +02:00
JaniruTEC 1c34402c87 Applied minor corrections 
See:
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273277251
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273280687
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273287847
 2023-07-25 13:17:21 +02:00
JaniruTEC 9bb24320bf Stopped user from mounting to vaults to the same path 2023-07-24 18:53:19 +02:00
CryptobotandGitHub ca71bb207f New Crowdin updates (#2945) 
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; 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-07-24 14:58:36 +02:00
JaniruTEC a29ebfd302 Updated error message 2023-07-19 23:39:11 +02:00
JaniruTEC bb0b1b3592 Cleaned up merge 2023-07-19 15:36:22 +02:00
Jan-Peter Klein ade277daf4 changed naming pattern and wording 2023-07-18 10:29:14 +02:00
Jan-Peter Klein c18f489e9d Merge branch 'develop' into feature/update-reminder 2023-07-17 15:32:25 +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
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
Jan-Peter Klein bc361ea592 added ui elements for update reminder 2023-07-10 13:04:07 +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
Jan-Peter Klein f817bc5378 implement requested changes from PR review 2023-07-06 11:03:34 +02:00
Jan-Peter Klein 2c506fcc97 rearranged view elements an renamed advancedSettings to expertSettings 2023-07-05 13:17:10 +02:00
Sebastian Stenzel 0ad8ce77ef handle "invalid setup code" error properly 2023-07-04 16:55:42 +02:00
Jan-Peter Klein 7bf2de6339 Merge branch 'develop' into feature/custom-shortening-threshold 2023-07-03 16:22:43 +02:00
Jan-Peter Klein 894d0528df refactoring 2023-07-03 15:34:01 +02:00
Sebastian Stenzel 746c8f54eb Merge branch 'develop' into feature/new-hub-keyloading 
# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/hub/CreateDeviceDto.java
#	src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java
 2023-06-30 16:20:59 +02:00
Sebastian Stenzel 9fc1efa005 adjust labels 2023-06-29 10:38:31 +02:00
Jan-Peter Klein 386bdd3490 added new AdvancedSettings scene in AddVaultWizard 2023-06-28 12:24:14 +02:00
Armin SchrenkandGitHub 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 150dd3e542 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into feature/error-dialog 2023-06-12 13:52:23 +02:00
CryptobotandGitHub 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
CryptobotandGitHub 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
Jan-Peter Klein b10523ea6c init commit 2023-05-09 09:00:56 +02:00