mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-18 16:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,980 Commits 29 Branches 213 Tags
de27bbf96e00a50bdd43c23a231b5ffb85d17a4b
Commit Graph

4980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Schrenk
de27bbf96e always cancle unlock result when closing the unlock window 2023-11-17 15:50:39 +01:00
Armin Schrenk
1199ef40dd on 409 repsonse of registerDevice-request, show setupFailed with adjusted message 2023-11-17 15:47:08 +01:00
Armin Schrenk
41c22b7840 Rename leftovers 2023-11-17 13:30:40 +01:00
Armin Schrenk
19cc4e8a37 Merge pull request #3194 from AntoineJT/feature/3155-toggle-vault-status-on-double-click 
Feature: Double click on a vault in the list to unlock it
 2023-11-15 16:51:44 +01:00
Antoine James Tournepiche
fd84ff09e1 No longer lock vault on double click 
See https://github.com/cryptomator/cryptomator/pull/3194#issuecomment-1806106843
 2023-11-10 22:05:58 +01:00
Antoine James Tournepiche
3dce175f94 Improve naming, avoid shadowing 2023-11-10 17:42:19 +01:00
Antoine James Tournepiche
0aaa3263cf Improve feature #3155 implementation 2023-11-09 23:50:34 +01:00
Antoine James Tournepiche
c4dcbd8c44 Implement requested feature #3155 
Toggle selected vault lock status on double click on a vault item
in the vault list on the main window
 2023-11-09 23:42:22 +01:00
Armin Schrenk
09ced50590 [ci skip] reset to snapshot version 2023-11-08 11:28:21 +01:00
Armin Schrenk
b2ab1a30a5 Merge branch 'main' into develop 2023-11-08 11:26:49 +01:00
Armin Schrenk
9eff3916b3 Merge branch 'release/1.11.0' 1.11.0 2023-11-08 11:26:13 +01:00
Armin Schrenk
98472d1952 use correct release date 2023-11-08 11:25:45 +01:00
Armin Schrenk
1ceafb69a5 finalize 1.11.0 2023-11-08 11:22:27 +01:00
Armin Schrenk
f3f4b6576c Merge branch 'develop' into release/1.11.0 
# Conflicts:
#	src/main/resources/i18n/strings.properties
 2023-11-08 10:52:30 +01:00
Cryptobot
e699d7dafc New Crowdin updates (#3189) 
* New translations strings.properties
German, Spanish, Turkish
[ci skip]
 2023-11-08 10:51:07 +01:00
Cryptobot
5eb6d186c0 New Crowdin updates (#3188) 
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-11-08 10:41:05 +01:00
Armin Schrenk
edc9409e56 pin wording 2023-11-08 10:19:12 +01:00
JaniruTEC
d015719fae Removed outdated translations 2023-11-07 18:52:48 +01:00
JaniruTEC
afc69e447e Renamed "setup code" to "Account Key" in localization files 2023-11-07 18:20:10 +01:00
JaniruTEC
54fbbd734f Renamed "setup code" to "Account Key" in UI 2023-11-07 18:19:12 +01:00
Sebastian Stenzel
d29872e69e add "Action Required" prompt 
when encountering http status 449 during vault unlock. fixes #3181

Co-authored-by: SailReal <julian.raufelder@skymatic.de>
(cherry picked from commit f2e7d0fae2)
 2023-11-07 12:20:27 +01:00
Tobias Hagemann
99fb9972f9 updated sponsors 
[ci skip]
 2023-11-02 15:37:19 +01:00
Sebastian Stenzel
f2e7d0fae2 add "Action Required" prompt 
when encountering http status 449 during vault unlock. fixes #3181

Co-authored-by: SailReal <julian.raufelder@skymatic.de>
 2023-11-02 14:41:58 +01:00
Armin Schrenk
7ff2e22f17 Merge branch 'develop' into release/1.11.0 1.11.0-beta2 2023-10-30 10:41:11 +01:00
Cryptobot
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
Sebastian Stenzel
19fe7ba6bf updated to tiny-oauth2-client 0.8.0 2023-10-27 19:54:58 +02:00
Armin Schrenk
7b522582fb Merge pull request #3163 from cryptomator/feature/3075-fix-ci-jdk-version 
Feature: Use fixed JDK version for releases
 2023-10-27 12:51:49 +02:00
Armin Schrenk
7594e51e2b Update debian.yml 
Remove architecture in apt install dependency
 2023-10-27 12:30:37 +02:00
Armin Schrenk
b3f0ff3662 use coffeelibs JDK for release builds 2023-10-27 12:10:37 +02:00
Armin Schrenk
8ce304a0c3 Add link to how-to-jdk-update in notification 2023-10-26 16:21:22 +02:00
Armin Schrenk
f893b2b5be Merge pull request #3026 from cryptomator/feature/uninstall-old-winfsp 
Feature: Update to WinFsp 2.x and uninstall old winfsp in Windows EXE installer
 2023-10-23 12:26:28 +02:00
Armin Schrenk
db868c6df7 move worklfow to correct directory 2023-10-20 16:22:45 +02:00
Sebastian Stenzel
6225d8d1f0 Merge branch 'develop' into release/1.11.0 1.11.0-beta1 2023-10-20 14:00:42 +02:00
Sebastian Stenzel
ed975b459e bump dependencies 2023-10-20 14:00:08 +02:00
Armin Schrenk
652a6f5c4d use environment variables and update current jdk 2023-10-20 13:42:00 +02:00
Armin Schrenk
a7a94099a8 Closes #3075 2023-10-20 13:35:03 +02:00
Armin Schrenk
71a3cbc334 add workflow to check for jdk updates 2023-10-20 13:29:43 +02:00
Armin Schrenk
800b2440b3 Merge pull request #3157 from cryptomator/feature/3113-network-timeout 
Time restrict network requests
 2023-10-20 12:58:08 +02:00
Sebastian Stenzel
f50a49e7a3 prepare 1.11.0 2023-10-20 12:11:06 +02:00
Sebastian Stenzel
92ece4dfb6 increased request timeout to 10s 2023-10-20 12:06:10 +02:00
Sebastian Stenzel
174225c60e add timeout to OAuth2 requests 2023-10-20 12:03:07 +02:00
Sebastian Stenzel
3071410a22 Merge branch 'develop' into feature/3113-network-timeout 2023-10-20 12:00:16 +02:00
Sebastian Stenzel
5c5777ffc5 Merge pull request #3091 from cryptomator/feature/simplify-out-of-bounds 
simplify out-of-bounds check
 2023-10-20 11:56:36 +02:00
Sebastian Stenzel
8dd8b93656 Merge pull request #3041 from cryptomator/feature/new-hub-keyloading 
Adjusted to Hub 1.3.x API
 2023-10-20 11:55:28 +02:00
Armin Schrenk
3b2d455b4a Update dependencies 2023-10-19 17:31:52 +02:00
Sebastian Stenzel
b0dfa22903 removed unused class 2023-10-19 12:49:19 +02:00
Sebastian Stenzel
88b1c28d88 Merge branch 'develop' into feature/new-hub-keyloading 2023-10-19 11:33:13 +02:00
Sebastian Stenzel
5b85d7859a bump webdav-nio-adapter version 2023-10-19 11:28:54 +02:00
Sebastian Stenzel
468eed58d5 cleanup 2023-10-19 10:00:14 +02:00
Sebastian Stenzel
34c17be474 add request timeouts 2023-10-19 10:00:03 +02:00