mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-14 08:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,722 Commits 36 Branches 214 Tags
2eb9f0fca8bc5d4e0b7ab8dfb606557e7adc5ddd
Commit Graph

5722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Schrenk
2eb9f0fca8 Fixes #3838 2025-04-30 12:12:04 +02:00
Armin Schrenk
9503feb9c4 Feature: Use user and system certificate stores on macOS (#3837) 2025-04-29 17:02:14 +02:00
Armin Schrenk
08e9f130e4 [skip ci] Merge branch 'main' into develop 2025-04-29 11:28:38 +02:00
Armin Schrenk
4e39eaa1f1 Merge branch 'release/1.16.0' 1.16.0 2025-04-29 11:27:56 +02:00
Armin Schrenk
eaca95e8dc finalize 1.16.0 2025-04-29 11:27:44 +02:00
Armin Schrenk
cf32e794c8 Merge branch 'develop' into release/1.16.0 2025-04-29 11:26:48 +02:00
Armin Schrenk
b5b221a5c7 remove manual wix installation from ci 2025-04-29 11:15:13 +02:00
Cryptobot
d7cb99a12d New Crowdin updates (#3819) 
New translations strings.properties

Chinese Traditional; Dutch; French; Hebrew; Italian; Latvian; Persian; Portuguese; Portuguese, Brazilian; Russian; Slovak; Spanish; Swedish; 

[ci skip]
 2025-04-29 10:55:33 +02:00
Armin Schrenk
b1893c63d4 Bump cryptofs from version 2.9.0-beta2 to 2.9.0 2025-04-28 13:00:21 +02:00
Armin Schrenk
b50cc703b6 Merge branch 'develop' into release/1.16.0 2025-04-15 13:46:30 +02:00
Armin Schrenk
9dc4a1dc5a [skip ci] update distribution build files to jfx 23.0.2 2025-04-15 13:45:14 +02:00
Armin Schrenk
f1a63a1679 update debian workflow to use JDK 23.0.2 2025-04-15 13:42:49 +02:00
Armin Schrenk
d53d4e3452 Merge branch 'develop' into release/1.16.0 1.16.0-beta2 2025-04-15 11:42:17 +02:00
Armin Schrenk
b7fa1ae6d8 Merge branch 'develop' into release/1.16.0 
# Conflicts:
#	src/main/java/org/cryptomator/common/vaults/Vault.java
#	src/main/java/org/cryptomator/ui/eventview/EventListCellController.java
#	src/main/java/org/cryptomator/ui/eventview/EventListCellFactory.java
#	src/main/java/org/cryptomator/ui/eventview/EventViewController.java
#	src/main/java/org/cryptomator/ui/eventview/EventViewModule.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
#	src/main/resources/css/dark_theme.css
#	src/main/resources/css/light_theme.css
#	src/main/resources/fxml/eventview.fxml
#	src/main/resources/fxml/vault_detail_unlocked.fxml
#	src/main/resources/fxml/vault_list.fxml
#	src/main/resources/i18n/strings.properties
 2025-04-15 11:41:39 +02:00
Cryptobot
3f192a587c New Crowdin updates (#3725) 
New translations strings.properties

Afrikaans; Arabic; Bashkir; 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; Marathi; Norwegian; 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; Urdu (Pakistan); Uyghur; Vietnamese; 

[ci skip]
 2025-04-15 11:31:16 +02:00
Armin Schrenk
3a1b0b17d6 fix translations 2025-04-15 11:23:46 +02:00
dependabot[bot]
5d2a243c55 Bump the java-test-dependencies group across 1 directory with 2 updates (#3776) 2025-04-15 08:59:50 +00:00
dependabot[bot]
008a2a3301 Bump the java-production-dependencies group with 4 updates (#3796) 2025-04-15 08:59:01 +00:00
Armin Schrenk
0680437004 Set a mininum width for the vault choice box in the event view 2025-04-14 17:38:21 +02:00
Armin Schrenk
db6cf5459e CI: Update and split up anti virus whitelisting flow (#3817) 2025-04-14 16:09:22 +02:00
Armin Schrenk
1d8466a9e3 Feature: Decrypt encrypted file name (#3788) 
Closes #2713
 2025-04-10 17:44:55 +02:00
Armin Schrenk
dcbcd692e7 [skip ci] Merge branch 'main' into develop 2025-04-09 14:02:14 +02:00
Armin Schrenk
87fd6c712a Merge branch 'hotfix/1.15.3' 1.15.3 2025-04-09 13:59:50 +02:00
Armin Schrenk
958505559f finalize 1.15.3 2025-04-09 13:54:50 +02:00
Armin Schrenk
4736e5e7e7 prepare 1.15.3 2025-04-09 13:53:07 +02:00
Armin Schrenk
55d217887a fixes #3809 2025-04-09 11:04:20 +02:00
dependabot[bot]
34ccd3ff73 Bump the maven-build-plugins group across 1 directory with 4 updates (#3813) 2025-04-08 15:49:18 +00:00
Tobias Hagemann
989c349331 Merge tag '1.15.2' into develop 
# -----BEGIN SSH SIGNATURE-----
# U1NIU0lHAAAAAQAAAhcAAAAHc3NoLXJzYQAAAAMBAAEAAAIBAKgu9N6lXOixsGNEmzxZhA
# Rc8ABi3MlOHGT30s3zCQEtvbE/j1QXRycgru5n/TZPKiEqZz5OGLM7FG3lNqHTjrQG1jfZ
# rH9JfmTRX9kLWyDmsiKJkB0L19NcCJQKwhkAdcJkbhQHP4bk1o3uMS+M89n6Y0nmUocGrk
# j7yX/79iQn7PQXdDRk7I+p0p1hCMC7fRlhxPwBX8iPOoty9L75ZoteRoWMGoq4T2fhDdUd
# 5ASRKfdVDjUnFrYvI+o8mhXdbzxNLjp5oN9VWQsb+YIkzApcI1+42BT5WABk+3cLlheqPR
# SocNgYdoZZPA1x6Zlzy2gggm33m/uU7gww2iATphdoyXoj1Nv9loMDOaCQUe6s7Fnnn+xH
# hC1fJoCRlrWJ2QjQmZj18KkrXp2/ZNfvLYUIoQVONF40iizb5GJewH00m1ZV+/oAqbJ/W1
# nfLmXJ/ShwACe3hyZFVOaB2582UyTDFCFJL2Bgbiw8y1ayS15+gs9TkFJlAtbpwofPqVB2
# 16iiE8ViFf//J5ommM1S2sHXaPvu1D038OScIGnz0grhnCjzBr3BduW7EYQ6RhVOqMaEUy
# mQiRKIAtfj+6eHgk3IxB3ynReUFQqE3wreE9buA0vrCO4aWEet+qJsg+395K+/l7E6LQOg
# 5rkgcVj9rtFeo4gFBT2AUUSLmHaqpfABAAAAA2dpdAAAAAAAAAAGc2hhNTEyAAACFAAAAA
# xyc2Etc2hhMi0yNTYAAAIAMAXINugL3MrR1dUYQILEttmSOilND0hlz90eGBXuKRcijebq
# TbIwOrTJBPBlHM5aJC1lzBPcfB5Irz0DWc8eg0u2W/vHxtDXP5VL6me6u92Rz6WV73VWMD
# P8otZlMci0n3C5mM8DhrI9Nvg3qthRS2JW5vt3TFA7rL6IiAqsbA/nXWNGZuQwP+tJGCXg
# lWMD9NHaE1mmCcH+im2Vvnhz0y2Q0IEJCN8MDTrOA3ydnmF+YJ1b2QyQFBGrX3TNitZajX
# Uft3Jw5glpSlcaNEZOPR0cMCPBYy0skMUs4ykq4bVTy3I2qASdY3vb4l795OJPrK5FYyed
# ML5Zad7V8yrif0Cy/Ywy1C4TN6ftoEVH6HFEmJTohEY5BjT5qNK5tpmEs/o7z8W2oJa9Su
# G+KMAGe6AS/4ryQ+OQRJXzzFnAQRnR2Ou3iAA2ypsGWmP09Sr+1bb2qRSvy+lybaayfSLQ
# FouTQxecNq5TVfo1PWaGH9lLxd4i3J0PLk6uM8HfkIFimEN8h+4XT/4YXwO1czwun+IWaS
# nD92KIrdoHth+v05f8PpuqCz6odzojO33GfkMU/6Lkp2RgYeHD4eDb2/vyIJUtZHTPwPPJ
# tDybf2GbcDD4F43+fZdz7Q5A4a9DSDHeB6qZoqou6pUttbTneKQn/tq2yVa0TpyUjbGoCA
# QBvT4=
# -----END SSH SIGNATURE-----
# gpg verification failed.

# Conflicts:
#	pom.xml
 2025-04-04 18:26:20 +02:00
Tobias Hagemann
b9df56a6de Merge branch 'hotfix/1.15.2' 1.15.2 2025-04-04 18:24:13 +02:00
Tobias Hagemann
38dbefff0b Updated webdav-nio-adapter dependency, fixes #3806, fixes #3807 2025-04-04 18:12:03 +02:00
Tobias Hagemann
4cbe45919b Moved jfuse dependency bump into dependencyManagement 2025-04-04 17:43:44 +02:00
Armin Schrenk
b7ccf7986d set version infos 2025-04-04 17:05:49 +02:00
Armin Schrenk
40d632a489 Closes #3807 2025-04-04 16:28:08 +02:00
Armin Schrenk
800aca5207 fix password enter dialog 2025-04-04 16:26:36 +02:00
Armin Schrenk
6a26d95c15 Feature: Event view (#3780) 2025-04-03 18:10:22 +02:00
Tobias Hagemann
439d3d7529 Update CONTRIBUTING.md 2025-03-29 18:00:22 +01:00
Armin Schrenk
7476e192a3 [skip ci] fix wrong JDK version in appimage build 2025-03-24 17:16:46 +01:00
Armin Schrenk
c6193bc259 update JDK for release builds to 23.0.2 (except ppa-builds) 2025-03-24 16:55:45 +01:00
Armin Schrenk
7446c69cd8 Update org.cryptomator:fuse-nio-adapter from 5.0.3 to 5.0.4 
fixes #3797
 2025-03-24 14:38:12 +01:00
Armin Schrenk
43c352e0d2 prepare 1.16.0 1.16.0-beta1 2025-03-18 11:39:46 +01:00
Armin Schrenk
61ec3bc465 Merge branch 'feature/event-view' into release/1.16.0 
# Conflicts:
#	pom.xml
 2025-03-18 11:39:22 +01:00
Armin Schrenk
36dd98127d update to cryptofs 2.9.0-beta2 2025-03-18 11:38:52 +01:00
Armin Schrenk
30862146b0 Merge branch 'feature/decrypt-name' into release/1.16.0 
# Conflicts:
#	pom.xml
 2025-03-18 11:21:54 +01:00
Armin Schrenk
c19734da6f decrypt name is always possible 2025-03-18 11:17:49 +01:00
Armin Schrenk
ba8fb273c7 cleanup 2025-03-18 11:14:38 +01:00
Armin Schrenk
5204a8e356 remove unused icons 2025-03-18 11:10:38 +01:00
Armin Schrenk
43b341860b extend styling to dark theme 2025-03-18 11:09:43 +01:00
dependabot[bot]
ad02e43daf Merge pull request #3787 from cryptomator/dependabot/maven/java-production-dependencies-af5d03dc73 2025-03-18 10:07:14 +00:00
Armin Schrenk
4942bcb52b exclude fasterxml:jackson-core dependency from auth0:java-jwt 2025-03-17 18:15:43 +01:00
dependabot[bot]
6b2e718e04 Bump the java-production-dependencies group across 1 directory with 13 updates 
Bumps the java-production-dependencies group with 13 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [org.cryptomator:cryptolib](https://github.com/cryptomator/cryptolib) | `2.2.0` | `2.2.1` |
| [org.cryptomator:fuse-nio-adapter](https://github.com/cryptomator/fuse-nio-adapter) | `5.0.2` | `5.0.3` |
| [org.cryptomator:webdav-nio-adapter](https://github.com/cryptomator/webdav-nio-adapter) | `2.0.7` | `2.0.8` |
| [org.cryptomator:integrations-api](https://github.com/cryptomator/integrations-api) | `1.5.0` | `1.5.1` |
| org.slf4j:slf4j-api | `2.0.16` | `2.0.17` |
| [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) | `1.5.16` | `1.5.17` |
| [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) | `1.5.16` | `1.5.17` |
| [io.github.coffeelibs:tiny-oauth2-client](https://github.com/coffeelibs/tiny-oauth2-client) | `0.8.0` | `0.8.1` |
| [com.auth0:java-jwt](https://github.com/auth0/java-jwt) | `4.4.0` | `4.5.0` |
| [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.18.2` | `2.18.3` |
| com.fasterxml.jackson.datatype:jackson-datatype-jsr310 | `2.18.2` | `2.18.3` |
| [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) | `26.0.1` | `26.0.2` |
| [org.cryptomator:integrations-linux](https://github.com/cryptomator/integrations-linux) | `1.5.2` | `1.5.3` |



Updates `org.cryptomator:cryptolib` from 2.2.0 to 2.2.1
- [Release notes](https://github.com/cryptomator/cryptolib/releases)
- [Commits](https://github.com/cryptomator/cryptolib/compare/2.2.0...2.2.1)

Updates `org.cryptomator:fuse-nio-adapter` from 5.0.2 to 5.0.3
- [Release notes](https://github.com/cryptomator/fuse-nio-adapter/releases)
- [Commits](https://github.com/cryptomator/fuse-nio-adapter/compare/5.0.2...5.0.3)

Updates `org.cryptomator:webdav-nio-adapter` from 2.0.7 to 2.0.8
- [Release notes](https://github.com/cryptomator/webdav-nio-adapter/releases)
- [Commits](https://github.com/cryptomator/webdav-nio-adapter/compare/2.0.7...2.0.8)

Updates `org.cryptomator:integrations-api` from 1.5.0 to 1.5.1
- [Release notes](https://github.com/cryptomator/integrations-api/releases)
- [Commits](https://github.com/cryptomator/integrations-api/compare/1.5.0...1.5.1)

Updates `org.slf4j:slf4j-api` from 2.0.16 to 2.0.17

Updates `ch.qos.logback:logback-core` from 1.5.16 to 1.5.17
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.16...v_1.5.17)

Updates `ch.qos.logback:logback-classic` from 1.5.16 to 1.5.17
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.16...v_1.5.17)

Updates `ch.qos.logback:logback-classic` from 1.5.16 to 1.5.17
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.16...v_1.5.17)

Updates `io.github.coffeelibs:tiny-oauth2-client` from 0.8.0 to 0.8.1
- [Release notes](https://github.com/coffeelibs/tiny-oauth2-client/releases)
- [Commits](https://github.com/coffeelibs/tiny-oauth2-client/compare/0.8.0...0.8.1)

Updates `com.auth0:java-jwt` from 4.4.0 to 4.5.0
- [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.4.0...4.5.0)

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

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.18.2 to 2.18.3

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.18.2 to 2.18.3

Updates `org.jetbrains:annotations` from 26.0.1 to 26.0.2
- [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.1...26.0.2)

Updates `org.cryptomator:integrations-linux` from 1.5.2 to 1.5.3
- [Release notes](https://github.com/cryptomator/integrations-linux/releases)
- [Commits](https://github.com/cryptomator/integrations-linux/compare/1.5.2...1.5.3)

---
updated-dependencies:
- dependency-name: org.cryptomator:cryptolib
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:fuse-nio-adapter
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:webdav-nio-adapter
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: io.github.coffeelibs:tiny-oauth2-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.auth0:java-jwt
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  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-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-linux
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-03-17 16:47:33 +00:00