mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-19 19:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,169 Commits 36 Branches 214 Tags
1fa4d42d274635e66f0c521ab38f4375014264ce
Commit Graph

6169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Schrenk
1fa4d42d27 use yml multiline syntax 2026-02-20 16:22:55 +01:00
Armin Schrenk
d5bc0914f4 fix description text for PR 2026-02-20 16:17:08 +01:00
Armin Schrenk
ee5165320d Update Git user email for automation commits 2026-02-19 12:04:36 +01:00
Armin Schrenk
3fb0e9328f ensure curl only uses https 2026-02-16 17:01:52 +01:00
Armin Schrenk
eb369ba5bd use envsubst also in create-pr job 2026-02-16 16:53:25 +01:00
Armin Schrenk
738bd56270 ensure curl is installed in container 2026-02-16 16:53:07 +01:00
Armin Schrenk
5e29f08d2b make pr-creation condition more explicit 2026-02-16 16:52:27 +01:00
Armin Schrenk
b3a5265b98 add adminConfig path as property 2026-02-16 16:29:01 +01:00
Armin Schrenk
d7d439947d Merge branch 'develop' into feature/aur-build 2026-02-16 16:17:09 +01:00
Armin Schrenk
2eda795219 create cryptomator dir in opt before copy 2026-02-16 16:01:32 +01:00
Armin Schrenk
158b454b0d fix NPE in EventualLogger 2026-02-16 12:45:57 +01:00
Armin Schrenk
18ce7d333d fix build 
* use JDK 25
* first install git, then checkout
 2026-02-16 11:01:43 +01:00
Armin Schrenk
0b4d86768a Closes #4088 2026-02-16 10:13:21 +01:00
Armin Schrenk
f32d0c463f use $GITHUB_WORKSPACE 
instead of github.workspace; bug in GitHubs CI system
 2026-02-16 10:03:23 +01:00
Armin Schrenk
7275ec9a61 fix envsubst command 2026-02-13 18:17:14 +01:00
Armin Schrenk
0fa34dba33 replace PKGBUILD with PKGBUILD.template 
use envsubst to create actual PKGBUILD
 2026-02-13 17:49:45 +01:00
Armin Schrenk
49f070977a use proper quotes 2026-02-13 13:59:11 +01:00
Armin Schrenk
35f39a9eaf minor fixes 2026-02-13 13:58:04 +01:00
Armin Schrenk
b9d21b1b7a replace hypens with underscore in pkgbuild version 2026-02-13 13:55:56 +01:00
Armin Schrenk
2e698317e5 Indirect github action inputs with env vars 2026-02-13 13:50:39 +01:00
Armin Schrenk
9c88fbab5e merge tarball job into pr creation job 2026-02-13 13:41:54 +01:00
Armin Schrenk
1a51642eb1 fix workflow 2026-02-13 13:30:47 +01:00
Armin Schrenk
fdaf5d1c36 rename 'aur' dir to ' makepkg' 
mention the format rather a specific repository
 2026-02-13 13:29:38 +01:00
Armin Schrenk
00e824a1ba fix workflow 2026-02-13 13:24:04 +01:00
Armin Schrenk
9c5ab7e311 build arch package on CLI 2026-02-13 13:18:34 +01:00
mindmonk
0bec741c2b Merge pull request #4120 from cryptomator/feature/disable-password-tab-if-masterkey-missing 
Disable recovery key actions in Vault Password options when masterkey is missing
 2026-02-12 18:08:52 +01:00
Armin Schrenk
327d6065e9 Merge pull request #4105 from cryptomator/feature/admin-properties 
Feature: Admin Config
 2026-02-11 15:25:31 +01:00
Armin Schrenk
33851a8559 Refactor admin props 
* rename class to AdminPropertiesFactory
* rename factory method to "create"
* remove side effects from methods
* returned properties default to system properties
 2026-02-11 15:12:52 +01:00
Armin Schrenk
cff47b1c73 wrap system properties instead of direct modification 2026-02-11 14:36:55 +01:00
Armin Schrenk
5db05d8bc7 Apply suggestions from codereview 2026-02-11 14:33:01 +01:00
Armin Schrenk
53f368108a Rename jvm property and actual config file 2026-02-09 16:54:04 +01:00
Armin Schrenk
5e52811c74 Remove hard coded default locations for admin config 2026-02-09 16:49:12 +01:00
Armin Schrenk
cad7b45808 Refactor to first check system property cryptomator.adminConfig for config path 2026-02-09 16:16:26 +01:00
Armin Schrenk
a057bf6f70 Merge branch 'develop' into feature/admin-properties 2026-02-09 15:03:06 +01:00
Armin Schrenk
4cf11cf293 [skip ci] update changelog 2026-02-09 14:56:37 +01:00
Armin Schrenk
2523609996 disable loading of user defined config for windows msi (#4132) 2026-02-09 14:49:07 +01:00
dependabot[bot]
80276ee992 Bump the github-actions group across 1 directory with 8 updates (#4124) 
Bumps the github-actions group with 8 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [actions/checkout](https://github.com/actions/checkout) | `6.0.1` | `6.0.2` |
| [actions/setup-java](https://github.com/actions/setup-java) | `5.1.0` | `5.2.0` |
| [actions/upload-artifact](https://github.com/actions/upload-artifact) | `5.0.0` | `6.0.0` |
| [actions/download-artifact](https://github.com/actions/download-artifact) | `6.0.0` | `7.0.0` |
| [actions/cache](https://github.com/actions/cache) | `4.3.0` | `5.0.3` |
| [skymatic/workflows/.github/workflows/run-dependency-check.yml](https://github.com/skymatic/workflows) | `3.0.1` | `3.0.2` |
| [fjogeleit/http-request-action](https://github.com/fjogeleit/http-request-action) | `1.16.6` | `2.0.0` |
| [skymatic/workflows](https://github.com/skymatic/workflows) | `3.0.1` | `3.0.2` |



Updates `actions/checkout` from 6.0.1 to 6.0.2
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](8e8c483db8...de0fac2e45)

Updates `actions/setup-java` from 5.1.0 to 5.2.0
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](f2beeb24e1...be666c2fcd)

Updates `actions/upload-artifact` from 5.0.0 to 6.0.0
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](330a01c490...b7c566a772)

Updates `actions/download-artifact` from 6.0.0 to 7.0.0
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](018cc2cf5b...37930b1c2a)

Updates `actions/cache` from 4.3.0 to 5.0.3
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](0057852bfa...cdf6c1fa76)

Updates `skymatic/workflows/.github/workflows/run-dependency-check.yml` from 3.0.1 to 3.0.2
- [Release notes](https://github.com/skymatic/workflows/releases)
- [Commits](1074588008...2d0c27a7b0)

Updates `fjogeleit/http-request-action` from 1.16.6 to 2.0.0
- [Release notes](https://github.com/fjogeleit/http-request-action/releases)
- [Changelog](https://github.com/fjogeleit/http-request-action/blob/main/RELEASE.md)
- [Commits](c0b95d02a0...551353b829)

Updates `skymatic/workflows` from 3.0.1 to 3.0.2
- [Release notes](https://github.com/skymatic/workflows/releases)
- [Commits](1074588008...2d0c27a7b0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: actions/setup-java
  dependency-version: 5.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: actions/upload-artifact
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/download-artifact
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/cache
  dependency-version: 5.0.3
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: skymatic/workflows/.github/workflows/run-dependency-check.yml
  dependency-version: 3.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: fjogeleit/http-request-action
  dependency-version: 2.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: skymatic/workflows
  dependency-version: 3.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2026-02-09 09:27:49 +01:00
Armin Schrenk
a7b8541912 Update Slack webhook URL secret in workflow 2026-01-30 15:27:31 +01:00
Jan-Peter Klein
d4382f3130 remove docTooltip 2026-01-28 18:40:56 +01:00
Jan-Peter Klein
2983745be5 remove docs link 2026-01-28 18:20:18 +01:00
Armin Schrenk
77983fe00a simplify EventualLogger init 2026-01-28 17:44:48 +01:00
Armin Schrenk
a4836f6528 cleanup 2026-01-28 17:36:52 +01:00
Armin Schrenk
e9b3b505a8 apply suggestions from code review 2026-01-28 17:35:34 +01:00
Armin Schrenk
19c9eada9d check first the filesize before opening a Reader to the config file 2026-01-28 17:32:10 +01:00
Jan-Peter Klein
2a5bce2c5c disable password tab when masterkey.file is missing 2026-01-27 17:42:04 +01:00
mindmonk
9ee81a0e35 Merge pull request #4106 from cryptomator/feature/move-recover-io-tasks-to-background 
Move recovery I/O to background thread
 2026-01-26 13:30:39 +01:00
Jan-Peter Klein
8b05ae0a54 dedup createTask 2026-01-23 16:09:06 +01:00
Jan-Peter Klein
aa898c634f refactor recovery restore to sync logic with async task wrapper for testability 2026-01-23 13:57:38 +01:00
Armin Schrenk
efbd107fb5 increase null safety 2026-01-21 18:09:26 +01:00
Armin Schrenk
300cac5441 don't forget log markers 2026-01-21 16:36:56 +01:00