mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-22 02:26:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,415 Commits 29 Branches 213 Tags
b142904cc33ceba2ce03b3c61a90bdb554e23621
Commit Graph

234 Commits

Author SHA1 Message Date
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
Armin Schrenk
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
Sebastian Stenzel
fb580ff79d read masterkey from JWE 2021-12-09 14:03:39 +01:00
Sebastian Stenzel
0110e5bedd added JWE decryption helper 2021-12-09 14:02:39 +01:00
Sebastian Stenzel
3cd99f680a Merge branch 'develop' into feature/hub 2021-11-24 16:23:10 +01:00
Tobias Hagemann
d4c3f02d8a beautified hub_register_device 2021-11-18 17:02:58 +01:00
Martin Beyer
63b40091ea rename supporterCert WhiteSpace and VaultNameLength methods 2021-11-18 12:06:50 +01:00
Sebastian Stenzel
5a735191a4 adjust heading 
(as it applies to both graceful and forced lock attempts)
 2021-11-17 14:05:42 +01:00
Sebastian Stenzel
21d342d117 Add non-forced retry lock button 2021-11-17 14:03:04 +01:00
Sebastian Stenzel
1b43bf395f apply same error handling to "force lock" as well 2021-11-17 13:45:43 +01:00
Sebastian Stenzel
839175a5e6 Merge branch 'develop' into feature/hub 
# Conflicts:
#	pom.xml
 2021-11-11 16:04:26 +01:00
Armin Schrenk
ce9e1184ec bump cryptofs dependency 2021-11-09 12:39:45 +01:00
Armin Schrenk
c1c5367e2a closes #1891 2021-11-03 11:54:24 +01:00
Cryptobot
9ef9499506 New Crowdin updates (#1886) 
* New translations strings.properties
[ci skip]
 2021-11-03 08:58:04 +01:00
Sebastian Stenzel
1ca803691b Revert "increase robustness of vault creation:" 
This reverts commit f7fdb87d6d.
 2021-11-03 08:57:35 +01:00
Sebastian Stenzel
5924e443fb Merge branch 'develop' into feature/hub 
# Conflicts:
#	.idea/runConfigurations/Cryptomator_Linux.xml
#	.idea/runConfigurations/Cryptomator_Linux_Dev.xml
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	.idea/runConfigurations/Cryptomator_macOS.xml
#	.idea/runConfigurations/Cryptomator_macOS_Dev.xml
#	pom.xml
 2021-11-02 15:53:23 +01:00
Cryptobot
27aea6cce9 New Crowdin updates (#1844) 
New translations strings.properties

Arabic; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Czech; Dutch; Filipino; French; German; Greek; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Slovak; Spanish; Swedish; Turkish; Ukrainian; 

[ci skip]
 2021-11-02 15:37:46 +01:00
Armin Schrenk
f7fdb87d6d increase robustness of vault creation: 
* clean up after failed vault creation
* ignore if storage readme cannot be created
 2021-11-02 11:50:14 +01:00
Armin Schrenk
c6c2133b34 closes #1863 2021-10-29 17:08:03 +02:00
Sebastian Stenzel
7a3205b19c updated choose file dialog screenshots for Windows #1863 2021-10-29 17:02:24 +02:00
Sebastian Stenzel
8fadd34498 prepared (currently unused) dark mode screenshots for #1863 2021-10-29 16:49:51 +02:00
Sebastian Stenzel
1ffcc8eacb desaturate irrelevant parts of image 2021-10-29 16:03:10 +02:00
Sebastian Stenzel
dfd4b86b06 Updated "choose file dialog" image 
references #1863
 2021-10-29 14:22:02 +02:00
Sebastian Stenzel
02a59dd538 support loading @2x images 2021-10-29 14:21:04 +02:00
Tobias Hagemann
a4070f551b fixes #1404 2021-10-27 11:56:49 +02:00
Sebastian Stenzel
5c98fe4145 fixed accessibility issue 2021-10-25 19:50:39 +02:00
Sebastian Stenzel
9b79e9e69e fixed second part of error code (#1741) 2021-10-25 19:34:45 +02:00
Bart
520b3a8f08 Remove IPC socket before creation (#1852) 
(to make sure that socket path can be created)
 2021-10-25 09:47:02 +02:00
Sebastian Stenzel
65b85fa4d8 Merge commit 'b211cb1856ef8d07583819b25586151471720cfd' into release/1.6.0 2021-10-14 14:00:11 +02:00
Cryptobot
b211cb1856 New Crowdin updates (#1822) 
[ci skip]
 2021-10-14 13:58:57 +02:00
Sebastian Stenzel
d7f48866da updated license infos 2021-10-13 13:01:53 +02:00
Armin Schrenk
e436ce372d Merge branch 'develop' into release/1.6.0 2021-10-08 16:35:19 +02:00
Armin Schrenk
8319a09b12 fix alignment in vault detail error screen 2021-10-08 14:24:50 +02:00
Armin Schrenk
ac1ff5fb79 Rework vautl detail unknown error dialog: 
* add buttons to reload, remove and show error dialog
* restyling
* add new strings
 2021-10-06 14:27:28 +02:00
Armin Schrenk
2f868304e4 Merge branch 'develop' into release/1.6.0 2021-10-05 11:59:57 +02:00
Sebastian Stenzel
813c69f6ac fixed broken bidi binding 2021-10-05 10:09:33 +02:00
Sebastian Stenzel
0d240cdb2d simpler spacing 2021-10-05 10:09:09 +02:00
JaniruTEC
1ef3e948be Fixes #1547: "Custom path" retains invalid value/state (#1548) 
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
 2021-10-04 14:31:48 +02:00
Armin Schrenk
2200a100e0 Merge branch 'develop' into release/1.6.0 2021-10-04 13:08:27 +02:00
Armin Schrenk
f5822fc568 fix bug in check run selection and add small space between buttons 2021-10-04 12:49:28 +02:00
Armin Schrenk
126201506c closes #1662 2021-10-04 12:02:55 +02:00
Sebastian Stenzel
c7d8cf5465 Merge branch 'develop' into release/1.6.0 2021-09-30 12:54:38 +02:00
Cryptobot
6415c29e3e New translations strings.properties (Greek) (#1816) 
[ci skip]
 2021-09-30 12:52:45 +02:00
Sebastian Stenzel
c1965086f3 update dagger to 2.39 2021-09-30 12:52:04 +02:00
Sebastian Stenzel
8795e5c8d2 Merge branch 'develop' into release/1.6.0 
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
 2021-09-27 13:52:29 +02:00
Cryptobot
069c07cbf1 New Crowdin updates (#1807) 
* New translations strings.properties
[ci skip]
 2021-09-27 13:49:32 +02:00