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,948 Commits 36 Branches 214 Tags
3e458060bcecc968dbdc6702b64a76e432a9cf3b
Commit Graph

5948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
3e458060bc Merge branch 'develop' into feature/jdk25 
# Conflicts:
#	.github/workflows/debian.yml
#	.github/workflows/dependency-check.yml
#	.github/workflows/win-exe.yml
#	.idea/misc.xml
#	dist/linux/debian/control
 2025-10-17 12:27:28 +02:00
Sebastian Stenzel
4bb5a3f10d fix unresolvable version in setup-java action 2025-10-17 12:12:44 +02:00
Armin Schrenk
de4c7d47e5 Merge pull request #3821 from cryptomator/feature/restore-vaultconfig 
Feature: Vault Recovery Enhancements
 2025-10-16 16:36:58 +02:00
Jan-Peter Klein
b4fe63c966 Merge branch 'feature/restore-vaultconfig' of https://github.com/cryptomator/cryptomator into feature/restore-vaultconfig 2025-10-16 15:38:16 +02:00
Jan-Peter Klein
ed45182b6c add IllegalStateException to the catch clause 2025-10-16 15:37:47 +02:00
Armin Schrenk
afd2d74c90 Merge branch 'develop' into feature/restore-vaultconfig 2025-10-16 15:25:27 +02:00
Jan-Peter Klein
4bcf01270a fix owner 2025-10-16 15:12:22 +02:00
Armin Schrenk
64466df6b8 [skip ci] revert powershell build early stop (was intended for testing purpose only) 2025-10-16 10:40:35 +02:00
Armin Schrenk
db9bd49dd9 add jdk modules jdk.crypto.ec and jdk.crypto.cryptoki requrired by nimbus-jose-jwt dependency 
references e50c949b62
 2025-10-16 10:38:01 +02:00
Cryptobot
4ed4a3e3e5 New Crowdin updates (#4009) 
New translations strings.properties

Arabic; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Czech; Danish; Dutch; Filipino; Finnish; French; German; Greek; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Slovak; Slovenian; Spanish; Swedish; Thai; Turkish; Ukrainian; Uyghur; Vietnamese; 

[ci skip]
 2025-10-16 10:19:44 +02:00
Armin Schrenk
ad73b2f31d Merge pull request #4015 from cryptomator/feature/pin-gh-actions-version 
Feature: Pin CI actions version
 2025-10-15 16:07:09 +02:00
Jan-Peter Klein
227b322b8a revert cleanup that introduced a bug 2025-10-15 15:55:29 +02:00
Armin Schrenk
ccf2e60390 add version info in a comment 2025-10-15 14:55:39 +02:00
Jan-Peter Klein
1104c1067a wording changes 2025-10-15 14:06:00 +02:00
Armin Schrenk
83d2c39080 also pin official github actions 2025-10-15 12:48:49 +02:00
Armin Schrenk
446caff901 Pin exact version of external ci actions 2025-10-15 12:31:38 +02:00
Jan-Peter Klein
90537caee7 change wording 2025-10-15 07:34:17 +02:00
Jan-Peter Klein
25dea8ebe6 infeo suggested wordings 2025-10-14 14:51:12 +02:00
Jan-Peter Klein
4a7d2907c8 use ellipsis 2025-10-14 14:28:53 +02:00
Jan-Peter Klein
7f3af0c7f6 add defaults to switches to solve sonar cloud issues 2025-10-14 13:41:15 +02:00
dependabot[bot]
e6e04078fa Bump the java-production-dependencies group across 1 directory with 5 updates (#4007) 2025-10-14 11:16:41 +00:00
Armin Schrenk
e3f6b5f812 Feature: JFX 25 (#4013) 
Closes #3902. References https://github.com/cryptomator/cryptomator/issues/3453 and references https://github.com/cryptomator/cryptomator/pull/3825
 2025-10-14 13:15:49 +02:00
Armin Schrenk
f3461f7da4 fix failing CI 2025-10-14 13:06:52 +02:00
Jan-Peter Klein
94518ede99 set the messageLabel directly 2025-10-14 10:04:14 +02:00
Jan-Peter Klein
0fa041da85 remove the unconditional constructor title 2025-10-14 08:15:37 +02:00
Jan-Peter Klein
daa4f3a568 recheck directory structure after restoring backup 2025-10-14 08:02:17 +02:00
Jan-Peter Klein
fc6f7d184c skip unsafe states and check config file before reload 2025-10-14 07:42:24 +02:00
Armin Schrenk
e50c949b62 Bump com.nimbusds:nimbus-jose-jwt from version 9.37.3 to version 10.5 
Addresses shaded vulnerability in CVE-2025-53864 (OSSINDEX)
 2025-10-13 11:50:54 +02:00
Armin Schrenk
349349e057 Add share option in context menu (#4008) 2025-10-10 11:04:37 +02:00
Armin Schrenk
4b36a1219f [skip ci] bump dependency-check-workflow to version 3 2025-10-08 14:11:57 +02:00
Armin Schrenk
6533ba7367 use more env context in CI 2025-10-08 10:36:29 +02:00
Tobias Hagemann
7f9c9a7df6 Reinstate original macOS icon shape in macOS 26 Tahoe (#3990) 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2025-10-08 09:57:10 +02:00
Armin Schrenk
afda8a4981 only create AUR PR if it is a stable release 2025-09-26 15:39:05 +02:00
Armin Schrenk
b9e91115b4 fix windows installer build 2025-09-26 13:38:02 +02:00
Armin Schrenk
cdcd43a805 first draft for JDK 25 migration (including comments) 2025-09-25 12:28:12 +02:00
dependabot[bot]
2d29b1a76f Bump the java-production-dependencies group across 1 directory with 5 updates (#3988) 
Closes #3883, closes #3932, closes #3982

Bumps the java-production-dependencies group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [org.cryptomator:fuse-nio-adapter](https://github.com/cryptomator/fuse-nio-adapter) | `5.0.5` | `5.1.0` |
| [org.cryptomator:integrations-api](https://github.com/cryptomator/integrations-api) | `1.6.0` | `1.7.0` |
| [org.cryptomator:integrations-mac](https://github.com/cryptomator/integrations-mac) | `1.4.0` | `1.4.1` |
| [org.cryptomator:integrations-linux](https://github.com/cryptomator/integrations-linux) | `1.6.0` | `1.6.1` |
| [org.cryptomator:integrations-win](https://github.com/cryptomator/integrations-win) | `1.5.0` | `1.5.1` |



Updates `org.cryptomator:fuse-nio-adapter` from 5.0.5 to 5.1.0
- [Release notes](https://github.com/cryptomator/fuse-nio-adapter/releases)
- [Changelog](https://github.com/cryptomator/fuse-nio-adapter/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/fuse-nio-adapter/compare/5.0.5...5.1.0)

Updates `org.cryptomator:integrations-api` from 1.6.0 to 1.7.0
- [Release notes](https://github.com/cryptomator/integrations-api/releases)
- [Changelog](https://github.com/cryptomator/integrations-api/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-api/compare/1.6.0...1.7.0)

Updates `org.cryptomator:integrations-mac` from 1.4.0 to 1.4.1
- [Release notes](https://github.com/cryptomator/integrations-mac/releases)
- [Changelog](https://github.com/cryptomator/integrations-mac/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-mac/compare/1.4.0...1.4.1)

Updates `org.cryptomator:integrations-linux` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/cryptomator/integrations-linux/releases)
- [Changelog](https://github.com/cryptomator/integrations-linux/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-linux/compare/1.6.0...1.6.1)

Updates `org.cryptomator:integrations-win` from 1.5.0 to 1.5.1
- [Release notes](https://github.com/cryptomator/integrations-win/releases)
- [Changelog](https://github.com/cryptomator/integrations-win/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-win/compare/1.5.0...1.5.1)

---
updated-dependencies:
- dependency-name: org.cryptomator:fuse-nio-adapter
  dependency-version: 5.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-api
  dependency-version: 1.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-mac
  dependency-version: 1.4.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-linux
  dependency-version: 1.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-win
  dependency-version: 1.5.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2025-09-22 15:47:26 +02:00
Cryptobot
f62a5ed74b New Crowdin updates (#3931) 
New translations strings.properties

Chinese Traditional; Danish; French; Greek; Korean; Polish; Swedish; Ukrainian; Vietnamese; 

[ci skip]
 2025-09-22 15:23:45 +02:00
dependabot[bot]
7fe7e1f5bf Bump org.mockito:mockito-core in the java-test-dependencies group (#3985) 2025-09-22 13:20:37 +00:00
dependabot[bot]
a4d9703cf4 Bump the maven-build-plugins group with 3 updates (#3984) 2025-09-22 13:12:52 +00:00
dependabot[bot]
c9a3a775cc Bump the java-production-dependencies group across 1 directory with 9 updates (#3978) 2025-09-16 15:08:10 +00:00
dependabot[bot]
e7cac42d5d Bump the maven-build-plugins group across 1 directory with 2 updates (#3977) 2025-09-16 14:27:31 +00:00
dependabot[bot]
983e7d973b Bump the github-actions group across 1 directory with 6 updates (#3970) 2025-09-16 14:19:24 +00:00
dependabot[bot]
a84ac94701 Bump the java-test-dependencies group across 1 directory with 3 updates (#3956) 2025-09-16 14:18:18 +00:00
Dhruv Bajpai
4761c58265 specify JVM crash log path (#3951) 
Add jvm option `-XX:+ErrorFile=...` with a clear, but with high possibility not-existing path to use fallback path.
 2025-09-16 14:19:59 +02:00
pxwanglu
682e762a5a chore: fix some typos in comments (#3960) 
Signed-off-by: pxwanglu <pxwanglu@icloud.com>
 2025-09-08 18:43:50 +02:00
Armin Schrenk
c3ada43abb Feature: Refactoring for Windows installer build (#3968) 
* decouple patchUpdateCheck script from app name
* simplify patchWebdav script and align it with patchUpdate
 2025-09-05 13:17:35 +02:00
Tobias Hagemann
9a71782fff Add Windows MSI installer option to disable update checks via DISABLEUPDATECHECK property (#3961) 
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-09-04 14:39:20 +02:00
Jan-Peter Klein
2f4c12a89e remove no more used injections 2025-09-04 08:45:04 +02:00
Jan-Peter Klein
2b79c58577 renaming and reordering 2025-09-04 08:44:18 +02:00
Jan-Peter Klein
1d3c62e2c7 revert cleanup that introduced a bug 2025-09-03 14:58:25 +02:00