mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,645 Commits 36 Branches 214 Tags
dcbcd692e771862811d0da6447d22e738715d8bb
Commit Graph

5645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ralph Plawetzki
a1323b5e81 Merge pull request #3785 from purejava/fix/improve-symbolic-icons 2025-03-17 17:46:23 +01:00
dependabot[bot]
ab4f487de1 Bump the javafx group with 5 updates (#3703) 2025-03-17 16:40:48 +00:00
Armin Schrenk
d506e7472d Bump cryptofs from 2.8.0 to 2.9.0-beta2 
Closes #3707
 2025-03-17 17:32:48 +01:00
Armin Schrenk
2d33d02b46 Feature: TouchID [macOS] 
Closes #2180
 2025-03-17 17:29:39 +01:00
Ralph Plawetzki
060ae588a2 Improve symbolic icons (#3782) 
* Remove the style attributes from the path tags
Fixes #3775
* Improve SVG code using a <g> tag and tighten current-color-scheme definition
* Add missing attribute from original SVG
 2025-03-14 13:22:14 +01:00
Armin Schrenk
401b0afe9f remove unnecessary code 2025-03-12 12:37:06 +01:00
Armin Schrenk
42ec41b991 clean up code 2025-03-12 12:19:27 +01:00
Armin Schrenk
7ec3c5d04f first delete, then write 2025-03-12 11:41:12 +01:00
Armin Schrenk
fb56b61a75 add exceptionally clause to keychain migration task 2025-03-11 17:14:42 +01:00
Armin Schrenk
c5c3d55658 Merge branch 'develop' into feature/touch-id 2025-03-11 17:08:13 +01:00
Armin Schrenk
b2bee99286 Refactor: Out-of-bounds-check (#3778) 
fixes #3723, fixes #3722
 2025-03-11 16:03:49 +01:00
Sebastian Stenzel
70b0413777 replace labels with issue type 
see https://github.blog/changelog/2025-01-13-evolving-github-issues-public-preview/#organize-your-work-with-issue-types
[ci skip]
 2025-03-07 09:32:39 +01:00
Sebastian Stenzel
577a77af38 moved summary to the top for better link previews 2025-03-07 09:31:35 +01:00
clkue
3aa627a467 fix unicode escaping for rtf file (#3609) 
Signed-off-by: C1emency <>
Signed-off-by: clkue <clemens_kuennemann@protonmail.com>
 2025-03-03 14:55:09 +01:00
Armin Schrenk
ae1b5fc925 Switch to ubuntu-22.04 for building the deb package 2025-03-03 12:05:25 +01:00
mindmonk
b1076f9c86 Merge pull request #3764 from cryptomator/feature/dialogBuilder-one-Button 
Feature: Simple Dialog with one Button
 2025-02-28 14:53:22 +01:00
Jan-Peter Klein
ede1c72595 cancelButtonVisible BooleanProperty to boolean 2025-02-28 13:29:04 +01:00
Jan-Peter Klein
4a397a8151 code cleanup 2025-02-26 12:36:03 +01:00
tturturiello
5318368879 Add underline effect to clickable notification labels (#3757) 2025-02-26 11:53:46 +01:00
Jan-Peter Klein
41a279da9d renamed property 2025-02-25 19:04:25 +01:00
Jan-Peter Klein
478c69f82c simple dialog without cancel button 2025-02-25 18:23:17 +01:00
Armin Schrenk
eb0e630a44 move migration to KeychainManager 2025-02-25 17:33:14 +01:00
Armin Schrenk
0bcbf9a13a add migration code and synchronize keychain edits 2025-02-25 16:32:38 +01:00
Armin Schrenk
e3073a3613 adjust wording for autoLock feature [skip ci] 2025-02-25 15:38:50 +01:00
Armin Schrenk
3333dc7f22 Fix not appearing removeCert dialog 2025-02-25 11:52:00 +01:00
Julian Raufelder
12ec6fbec8 Change /access-token deviceId header name to Hub-Device-ID 2025-02-19 14:25:34 +01:00
Armin Schrenk
43fc976ad7 reduce #3311 to touchID 2025-02-19 11:49:59 +01:00
Julian Raufelder
92b3a9e1bd Merge pull request #3752 from cryptomator/feature/add-device-id-during-hub-unlock 
Send DeviceId to Hub during vault key retrieval
 2025-02-19 09:51:39 +01:00
Julian Raufelder
fc7169f2a0 Send DeviceId to Hub during vault key retrieval 
See https://github.com/cryptomator/hub/pull/320
 2025-02-19 09:05:13 +01:00