mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-21 10:06:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,786 Commits 29 Branches 213 Tags
cdca4e047d15c0b2224b5f17c2fb397eae6c7543
Commit Graph

2786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
cdca4e047d Merge branch 'develop' into feature/vault-format-8 2021-03-17 12:55:47 +01:00
Sebastian Stenzel
31e938de6a Merge pull request #1587 from cryptomator/feature/jdk-16 
Update to JDK 16
 2021-03-17 12:29:29 +01:00
Sebastian Stenzel
4c10ab764a updated README 2021-03-17 09:33:43 +01:00
Sebastian Stenzel
4e075ab0ca using pattern-matching instanceof where applicable 2021-03-17 09:22:16 +01:00
Sebastian Stenzel
f73ae9759f use new Stream.toList() where applicable 2021-03-17 09:16:44 +01:00
Sebastian Stenzel
f6283b2f7e using text blocks where applicable 2021-03-17 09:12:54 +01:00
Sebastian Stenzel
b23d2e4def allow use of reflection in codacy coverage reporter 2021-03-17 08:19:58 +01:00
Sebastian Stenzel
91a2943599 update to JDK 16 2021-03-17 08:16:26 +01:00
Sebastian Stenzel
e32ce22d24 Merge branch 'develop' into feature/vault-format-8 2021-03-10 12:48:58 +01:00
Armin Schrenk
e75c415b46 Load vault config on demand and don't cache it 
* fixes issue with unlock after vault migration
 2021-03-10 12:03:46 +01:00
Sebastian Stenzel
0ab28602d1 bumped cryptofs version 2021-03-05 17:33:58 +01:00
Sebastian Stenzel
62c8edff04 Choose key loading workflow depending on vaultconfig's key ID and allow KeyLoadingComponent to decide itself, what exceptions it can handle 2021-03-03 17:41:17 +01:00
Sebastian Stenzel
d01c6268f8 remove unused field 
[ci skip]
 2021-03-02 16:16:24 +01:00
Sebastian Stenzel
e083fd0bcc skip certain steps on forks 2021-03-02 11:55:20 +01:00
Cryptobot
ff687f1bae fix: main/pom.xml to reduce vulnerabilities (#1569) 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-1080611

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
 2021-03-02 08:43:10 +01:00
Sebastian Stenzel
557aaa2480 Removed unused imports 
[ci skip]
 2021-03-01 15:59:13 +01:00
Sebastian Stenzel
78e43d401d split package org.cryptoamtor.ui.unlock to allow for different kinds of unlock workflows 2021-03-01 15:58:00 +01:00
Sebastian Stenzel
7b08c5d287 Merge branch 'develop' into feature/vault-format-8 
# Conflicts:
#	main/pom.xml
#	main/ui/src/main/resources/license/THIRD-PARTY.txt
[ci skip]
 2021-02-26 10:10:50 +01:00
Sebastian Stenzel
84d2644f19 fix wrong versions that have been merged from main branch 2021-02-26 10:05:26 +01:00
Armin Schrenk
f9a9d7b870 Merge tag '1.5.13' into develop 
1.5.13
 2021-02-24 16:21:07 +01:00
Armin Schrenk
d75a8c4bba Merge branch 'release/1.5.13' 1.5.13 2021-02-24 16:21:06 +01:00
Armin Schrenk
d326c7c990 preparing 1.5.13 2021-02-24 16:17:35 +01:00
Armin Schrenk
e8e63ca4fc Merge pull request #1517 from cryptomator/feature/translations 
New Crowdin updates
 2021-02-24 16:12:30 +01:00
Armin Schrenk
6878f2e94b Merge pull request #1556 from cryptomator/feature/win-auto-theme 
Feature/win auto theme
 2021-02-24 14:31:17 +01:00
Armin Schrenk
a17b416262 only remove system theme change listener, if one was previously registered. 2021-02-24 12:54:56 +01:00
Armin Schrenk
fed572694f Merge branch 'develop' into feature/win-auto-theme 
# Conflicts:
#	main/pom.xml
 2021-02-24 12:25:04 +01:00
Armin Schrenk
fe3d67d937 update build workflow 2021-02-24 12:21:13 +01:00
Armin Schrenk
3dcdeb1033 refactor pom to store targeted jdk build version in variable 2021-02-24 12:19:12 +01:00
Armin Schrenk
0898158c5a remove bintray as source repository in pom 2021-02-24 12:18:38 +01:00
Armin Schrenk
81091d4bdf bump integrations-* repos and implement new interface methods 2021-02-24 12:18:24 +01:00
Martin Beyer
c9b1b1baa5 Fixes #1291 (Windows Automatic Theme) 2021-02-23 17:26:50 +01:00
Tobias Hagemann
c81f3bd972 updated dependencies 2021-02-23 13:43:07 +01:00
Sebastian Stenzel
9f86b74320 New translations strings.properties (Greek) 
[ci skip]
 2021-02-23 09:32:09 +01:00
Sebastian Stenzel
2d8390a0f3 New translations strings.properties (Chinese Simplified) 
[ci skip]
 2021-02-22 11:47:50 +01:00
Sebastian Stenzel
8d3671175f New translations strings.properties (Swedish) 
[ci skip]
 2021-02-21 16:16:10 +01:00
Sebastian Stenzel
366011a222 New translations strings.properties (Swedish) 
[ci skip]
 2021-02-21 15:45:39 +01:00
Sebastian Stenzel
c0c2e21055 New translations strings.properties (Korean) 
[ci skip]
 2021-02-20 02:29:34 +01:00
Sebastian Stenzel
63be96a151 New translations strings.properties (Korean) 
[ci skip]
 2021-02-20 01:58:05 +01:00
Sebastian Stenzel
fc1df4bd99 New translations strings.properties (Catalan) 
[ci skip]
 2021-02-19 21:46:49 +01:00
Sebastian Stenzel
7657330931 New translations strings.properties (German) 
[ci skip]
 2021-02-19 13:17:33 +01:00
Sebastian Stenzel
4e44de3c3b New translations strings.properties (Portuguese, Brazilian) 
[ci skip]
 2021-02-19 01:07:24 +01:00
Sebastian Stenzel
8d902a72ca New translations strings.properties (Turkish) 
[ci skip]
 2021-02-18 19:39:40 +01:00
Sebastian Stenzel
7378031a72 New translations strings.properties (Spanish) 
[ci skip]
 2021-02-18 17:15:20 +01:00
Sebastian Stenzel
f898c07c27 New translations strings.properties (German) 
[ci skip]
 2021-02-18 16:41:50 +01:00
Sebastian Stenzel
c8f02d1045 New translations strings.properties (Czech) 
[ci skip]
 2021-02-18 14:56:07 +01:00
Sebastian Stenzel
4cc13b986b New translations strings.properties (Slovak) 
[ci skip]
 2021-02-18 14:22:12 +01:00
Sebastian Stenzel
af7b6780f3 New translations strings.properties (Italian) 
[ci skip]
 2021-02-18 14:22:10 +01:00
Sebastian Stenzel
4a17d01004 New translations strings.properties (French) 
[ci skip]
 2021-02-18 13:42:57 +01:00
Sebastian Stenzel
1d68408e21 New translations strings.properties (Japanese) 
[ci skip]
 2021-02-18 13:42:49 +01:00
Sebastian Stenzel
821b1ee660 New translations strings.properties (Russian) 
[ci skip]
 2021-02-18 13:42:45 +01:00