mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-17 08:06:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,386 Commits 29 Branches 213 Tags
develop
Commit Graph

55 Commits

Author SHA1 Message Date
LamTrinh.Dev
d67aa9c10a + Update Copyright year from "2016 - 2025" to "2016-2026". (#4218) 
* + Update Copyright year from "2016 - 2025" to "2016-2026".
 2026-04-13 15:30:33 +02:00
Armin Schrenk
7331144f9d Set cryptomator.hub.enableTrustOnFirstUse (#4182) 
in installers/package containers
 2026-03-12 13:13:49 +01:00
Armin Schrenk
0ac63e7aba Closes #4136 2026-02-18 11:26:42 +01:00
Armin Schrenk
53f368108a Rename jvm property and actual config file 2026-02-09 16:54:04 +01:00
Armin Schrenk
cad7b45808 Refactor to first check system property cryptomator.adminConfig for config path 2026-02-09 16:16:26 +01:00
Sebastian Stenzel
593a64c9bd Bump JDK to version 25 (#4031) 
* first draft for JDK 25 migration (including comments)

* fix unresolvable version in setup-java action

* switch to official `openjdk-25-jdk` ubuntu package

see https://packages.ubuntu.com/search?suite=jammy&arch=any&searchon=names&keywords=openjdk-25

* update jacoco to support JDK 25

* use jdk 25.0.1 for building the app

# Conflicts:
#	.github/workflows/win-exe.yml

* Use correct SHA256 value for openjfx linux arm64

* zulu version is different to temurin :rolling_eyes:

* fix check-jdk-updates

---------

Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-11-12 10:50:37 +01: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
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
79f2863f24 suppress warning message caused by javafx (see JDK-8345121) 2025-06-16 11:23:25 +02:00
Armin Schrenk
941b4e3652 Feature: JavaFX 24 (#3882) 2025-06-03 15:51:37 +02:00
Armin Schrenk
d6bbcfbbc1 Revert "[skip ci] coffeelibs jdk is built with JEP 493" 
This reverts commit 0a0dde3f47.
 2025-05-21 11:50:55 +02:00
Armin Schrenk
0a0dde3f47 [skip ci] coffeelibs jdk is built with JEP 493 2025-05-13 15:22:39 +02:00
Armin Schrenk
e27e303c01 [skip ci] use JDK 24 also for deb build 2025-05-13 14:12:07 +02:00
Armin Schrenk
3b8fec4c5a Feature: Use system certificate stores/custom pkcs12 file (#3675) 
* for Windows use Windows certificate
* for macOS use macOS Keychain
* for Linux use a custom PKCS12 file under /etc/cryptomator/certs.p12
 2025-01-17 15:12:38 +01:00
Julian Raufelder
a6c60ac5d0 Hello 2025 🎉 2025-01-14 16:34:32 +01:00
Armin Schrenk
f51780dcb5 also update deb rules file [ci skip] 2024-12-10 18:03:07 +01:00
Armin Schrenk
4778ba0770 add autostart for deb artifact 2024-08-16 15:56:58 +02:00
Armin Schrenk
b9403222ba add java.compiler module to build scripts 
references 93d0fd41a6 and https://github.com/google/dagger/issues/4321
 2024-08-13 16:28:09 +02:00
Armin Schrenk
69bcf6fac6 do not forget to update debian files 
(dammn you unflexible launchpad!)
 2024-05-21 12:51:01 +02:00
Armin Schrenk
357a0b9c31 closes #3376 2024-05-14 17:58:21 +02:00
lectrical
ed902bc59f Hello 2024 2024-01-20 16:22:27 +01:00
Armin Schrenk
8f32b46b30 set no jlink compression for build artifacts 
references 00fc2a9837
 2024-01-12 13:18:05 +01:00
Armin Schrenk
00fc2a9837 remove deprecate compress options and use default ones 
see also https://bugs.openjdk.org/browse/JDK-8301124?jql=text%20~%20%22compress%22
 2024-01-11 22:59:08 +01:00
Sebastian Stenzel
e1d7fd92ad Merge branch 'develop' into feature/jdk21 
# Conflicts:
#	pom.xml
 2023-09-25 12:15:14 +02:00
Sebastian Stenzel
aa382ce80d update coffeelibs jdk to 21 2023-09-18 19:10:54 +02:00
Sebastian Stenzel
47bd0ca647 disable update check for PPA builds 2023-09-18 13:10:19 +02:00
Armin Schrenk
1a153e1f6e Merge branch 'develop' into libappindicator 2023-07-26 14:18:42 +02:00
Armin Schrenk
f1d4bd4cd4 Closes #2989 2023-07-13 12:22:46 +02:00
Ralph Plawetzki
da8410842b Change showTrayIcon to true for all Linux builds 2023-07-11 19:56:22 +02:00
Ralph Plawetzki
449e330992 Merge branch cryptomator/develop 2023-07-01 18:45:45 +02:00
Ralph Plawetzki
0f0855165e Changes due to new handling of system environment 
Introduced with PR #2957
 2023-07-01 18:02:12 +02:00
Armin Schrenk
ec645a4bb9 replace ~ by @{userhome} on unix systems 2023-06-20 16:37:32 +02:00
Ralph Plawetzki
d5cad1a704 Lost+found 
Things I forgot or could be more simple
 2023-06-05 19:13:25 +02:00
Armin Schrenk
085f762a35 further fixing debian 2023-05-09 15:48:06 +02:00
Armin Schrenk
74718754ad fix merge 2023-01-26 13:48:30 +01:00
Armin Schrenk
eb595379d6 Merge branch 'develop' into release/1.7.0 
# Conflicts:
#	dist/linux/debian/control
#	dist/linux/debian/cryptomator.sh
 2023-01-26 13:47:46 +01:00
Ralph Plawetzki
8139cb8c38 Add jdk.security.auth module to rules 2023-01-22 20:05:13 +01:00
Julian Raufelder
9182c415eb Hello 2023 🎉 2023-01-04 13:35:58 +01:00
Sebastian Stenzel
4fda4a2b2e fix makefile 2022-12-12 09:09:25 +01:00
Armin Schrenk
c45a00377d Merge branch 'develop' into feature/mount-provider 
# Conflicts:
#	.github/workflows/appimage.yml
#	.github/workflows/mac-dmg.yml
#	.github/workflows/win-exe.yml
#	pom.xml
#	src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
#	src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
 2022-12-07 17:01:56 +01:00
Sebastian Stenzel
a3fc68ab6f jlink javafx.* modules from arch-dependent jmod path 2022-11-30 11:16:38 +01:00
Sebastian Stenzel
abf944a130 add required openjfx jmods to debian source package 2022-11-30 11:16:38 +01:00
Sebastian Stenzel
6325c6f450 fixed java options required for panama 2022-11-25 14:42:18 +01:00
Armin Schrenk
dd79b46d72 add --enable-preview flag to java runtime options 2022-11-25 12:21:37 +01:00
Sebastian Stenzel
6367cc2dfb depend on coffeelibs-jdk-19 2022-10-14 13:10:37 +02:00
Armin Schrenk
d5bdea4a75 fix debian build script 
Fixes #2352
 2022-07-27 11:57:00 +02:00
Sebastian Stenzel
d1c4eda072 Merge branch 'develop' into feature/hub 
# Conflicts:
#	.github/workflows/appimage.yml
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
 2022-04-25 15:30:56 +02:00
Sebastian Stenzel
2108a77e12 adjusted build scripts for Cryptomator Hub 2022-04-08 20:45:22 +02:00
Sebastian Stenzel
b565f1d0c0 remove unused java binaries from jlinked runtime image 2022-03-18 17:26:28 +01:00
Sebastian Stenzel
0c6f4297a2 display version as x.y.z deb-1234 instead of x.y.z ppa-1234 2022-03-03 10:40:40 +01:00