mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-06-09 21:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,453 Commits 34 Branches 213 Tags
develop
Commit Graph

6453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel 1e3dfe3de1 Merge pull request #4180 from cryptomator/feature/patched-masterkey-loading 
don't load masterkey from arbitrary paths
 2026-03-12 10:23:43 +01:00
Sebastian Stenzel dcb1f5e80f pin appimagetool 2026-03-12 10:21:12 +01:00
Sebastian Stenzel 5c75eeab27 reuse existing constant 2026-03-12 10:18:19 +01:00
Sebastian Stenzel 8e4bff8c19 don't load masterkey from arbitrary paths 2026-03-12 09:58:52 +01:00
Sebastian Stenzel e066f155b2 filter out "" 2026-03-12 09:21:55 +01:00
Sebastian Stenzel c3c7a23ccd added test 2026-03-12 09:14:27 +01:00
Sebastian Stenzel c816411644 deserialize null as empty 2026-03-12 09:13:40 +01:00
Sebastian Stenzel f752490624 default to mutable collections 2026-03-12 09:12:09 +01:00
Sebastian Stenzel d196b66b4e refined rules 2026-03-12 09:02:19 +01:00
Sebastian Stenzel d803a1d71e apply suggestions from code review 2026-03-11 23:17:16 +01:00
Sebastian Stenzel c75430cde2 only trust subdomains of .cryptomator.cloud 
not `notcryptomator.cloud`
 2026-03-11 23:13:50 +01:00
Sebastian Stenzel f44c3531c7 devicesResourceUrl: optional consistency check 2026-03-11 23:12:13 +01:00
Sebastian Stenzel 596829bc77 dedup 2026-03-11 23:09:04 +01:00
Sebastian Stenzel 096aeb0c54 renamed var 
[ci skip]
 2026-03-11 22:49:28 +01:00
Sebastian Stenzel 1a12684557 fix test 2026-03-11 22:42:25 +01:00
Sebastian Stenzel 998664acc3 distrust http (except for localhost) 2026-03-11 22:01:21 +01:00
Sebastian Stenzel c52b3fc4ad change scene without lag 2026-03-11 22:01:14 +01:00
Sebastian Stenzel 1fde3650ca renamed classes 2026-03-11 21:47:33 +01:00
Sebastian Stenzel 57614f59e4 trust *.cryptomator.cloud 2026-03-11 21:38:51 +01:00
Sebastian Stenzel a95883f98b renamed system properties 2026-03-11 21:32:51 +01:00
Sebastian Stenzel 6cf18c33a1 simplify sorting 2026-03-11 21:12:47 +01:00
Sebastian Stenzel 232e6fbf71 add tests 2026-03-11 21:05:14 +01:00
Sebastian Stenzel d15731d5a4 add plural label 2026-03-11 20:30:00 +01:00
Sebastian Stenzel 45d7421e4f add "reset trusted hosts" button to general preferences 2026-03-11 20:24:56 +01:00
Sebastian Stenzel 4d0aabfe6e cleanup 2026-03-11 20:12:16 +01:00
Sebastian Stenzel db0e266fde clean up dialog 2026-03-11 19:48:37 +01:00
Sebastian Stenzel 6281561ab4 add -Dcryptomator.allowUnknownHubHosts=true 2026-03-11 18:53:14 +01:00
Sebastian Stenzel b981f0dc19 moved logic to separate controller 2026-03-11 18:52:36 +01:00
Armin Schrenk bc41429982 Use environment for cryptomator system properties 2026-03-11 17:59:58 +01:00
Armin Schrenk a31621cfde validate hub config and check allowed hosts file 2026-03-11 17:35:22 +01:00
Armin Schrenk aa68224d63 Add new properties to admin config 
* allowUnknownHubHosts
* allowedHubHosts
 2026-03-11 16:49:48 +01:00
Armin Schrenk b8413a21a3 update appstream info 2026-03-09 17:01:46 +01:00
Armin Schrenk af59196f19 [skip ci] Merge branch 'main' into develop 2026-03-09 09:32:54 +01:00
Armin Schrenk 3a58f560fc Merge branch 'release/1.19.0' 1.19.0 2026-03-09 09:27:31 +01:00
Armin Schrenk a2cca0b624 finalize release 2026-03-08 23:53:07 +01:00
Armin Schrenk 0c4ba94f10 Merge branch 'develop' into release/1.19.0 2026-03-08 23:47:36 +01:00
Cryptobot 0f8b6a8f51 New Crowdin updates (#4170) 
* New translations strings.properties (Korean)
[ci skip]
 2026-03-08 23:45:59 +01:00
Armin Schrenk 8ca6946fe6 Suppress CVE-2025-11143 
Jetty is used only locally
 2026-03-08 18:08:23 +01:00
Armin Schrenk e583b70931 use correct filename for admin config on Windows 2026-03-07 12:06:13 +01:00
Armin Schrenk d9134b49ad add workflow_call to release artifact workflows 2026-03-06 17:11:11 +01:00
Armin Schrenk 6f6d0d8771 Update wording in release draft 2026-03-06 12:58:17 +01:00
Armin Schrenk 9d3d67b605 Update changelog 1.19.0-rc1.1 1.19.0-rc1 2026-03-05 23:12:58 +01:00
Armin Schrenk 8da27e36d6 Merge branch 'develop' into release/1.19.0 2026-03-05 23:10:11 +01:00
dependabot[bot] 1123fa28a3 Bump org.apache.maven.plugins:maven-resources-plugin (#4167) 
Bumps the maven-build-plugins group with 1 update: [org.apache.maven.plugins:maven-resources-plugin](https://github.com/apache/maven-resources-plugin).


Updates `org.apache.maven.plugins:maven-resources-plugin` from 3.4.0 to 3.5.0
- [Release notes](https://github.com/apache/maven-resources-plugin/releases)
- [Commits](https://github.com/apache/maven-resources-plugin/compare/v3.4.0...maven-resources-plugin-3.5.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-resources-plugin
  dependency-version: 3.5.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: maven-build-plugins
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2026-03-05 23:09:12 +01:00
Armin Schrenk be3ecc536a Update to cryptofs 2.10.0 2026-03-05 17:47:52 +01:00
Armin Schrenk 94c8dd911b [skip ci] update changelog 2026-03-05 17:45:14 +01:00
Armin Schrenk 7e888b0e3b ensure logging for Substituting properties 2026-03-05 17:44:47 +01:00
dependabot[bot] a066afe37d Bump the java-production-dependencies group with 8 updates (#4152) 
* Bump the java-production-dependencies group with 8 updates

Bumps the java-production-dependencies group with 8 updates:

| Package | From | To |
| --- | --- | --- |
| [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) | `1.5.31` | `1.5.32` |
| [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) | `1.5.31` | `1.5.32` |
| [com.auth0:java-jwt](https://github.com/auth0/java-jwt) | `4.5.0` | `4.5.1` |
| [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.21.0` | `2.21.1` |
| com.fasterxml.jackson.datatype:jackson-datatype-jsr310 | `2.21.0` | `2.21.1` |
| [com.google.dagger:dagger](https://github.com/google/dagger) | `2.59.1` | `2.59.2` |
| [com.google.dagger:dagger-compiler](https://github.com/google/dagger) | `2.59.1` | `2.59.2` |
| [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) | `26.0.2-1` | `26.1.0` |


Updates `ch.qos.logback:logback-core` from 1.5.31 to 1.5.32
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.31...v_1.5.32)

Updates `ch.qos.logback:logback-classic` from 1.5.31 to 1.5.32
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.31...v_1.5.32)

Updates `ch.qos.logback:logback-classic` from 1.5.31 to 1.5.32
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.31...v_1.5.32)

Updates `com.auth0:java-jwt` from 4.5.0 to 4.5.1
- [Release notes](https://github.com/auth0/java-jwt/releases)
- [Changelog](https://github.com/auth0/java-jwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/java-jwt/compare/4.5.0...4.5.1)

Updates `com.fasterxml.jackson.core:jackson-databind` from 2.21.0 to 2.21.1
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.21.0 to 2.21.1

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.21.0 to 2.21.1

Updates `com.google.dagger:dagger` from 2.59.1 to 2.59.2
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.59.1...dagger-2.59.2)

Updates `com.google.dagger:dagger-compiler` from 2.59.1 to 2.59.2
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.59.1...dagger-2.59.2)

Updates `org.jetbrains:annotations` from 26.0.2-1 to 26.1.0
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.2-1...26.1.0)

Updates `com.google.dagger:dagger-compiler` from 2.59.1 to 2.59.2
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.59.1...dagger-2.59.2)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
  dependency-version: 1.5.32
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-classic
  dependency-version: 1.5.32
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-classic
  dependency-version: 1.5.32
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.auth0:java-jwt
  dependency-version: 4.5.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.21.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-version: 2.21.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-version: 2.21.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.google.dagger:dagger
  dependency-version: 2.59.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.google.dagger:dagger-compiler
  dependency-version: 2.59.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.jetbrains:annotations
  dependency-version: 26.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: com.google.dagger:dagger-compiler
  dependency-version: 2.59.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* [skip ci] update changelog

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2026-03-05 17:29:09 +01:00
Cryptobot 21c8cbf709 New Crowdin updates (#4148) 
New translations strings.properties

Arabic; Bulgarian; Chinese Simplified; Chinese Traditional; Danish; Dutch; Finnish; French; German; Greek; Italian; Japanese; Korean; Latvian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Russian; Slovak; Spanish; Swedish; Turkish; Ukrainian; Vietnamese; 

[ci skip]
 2026-03-05 17:28:41 +01:00
dependabot[bot] ea236d45a3 Bump the java-test-dependencies group across 1 directory with 2 updates (#4079) 
Bumps the java-test-dependencies group with 2 updates in the / directory: [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) and [org.mockito:mockito-core](https://github.com/mockito/mockito).


Updates `org.junit.jupiter:junit-jupiter` from 5.13.4 to 6.0.1
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.4...r6.0.1)

Updates `org.mockito:mockito-core` from 5.20.0 to 5.21.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.20.0...v5.21.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 6.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: java-test-dependencies
- dependency-name: org.mockito:mockito-core
  dependency-version: 5.21.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: java-test-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2026-03-05 17:27:42 +01:00