mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-17 12:46:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,505 Commits 31 Branches 215 Tags
develop
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian StenzelandGitHub 6b82abcd80 Merge pull request #4179 from cryptomator/feature/admin-config-allowlist 
Hub: Trust on first use
 2026-03-12 12:26:59 +01:00
Sebastian StenzelandGitHub 1e3dfe3de1 Merge pull request #4180 from cryptomator/feature/patched-masterkey-loading 
don't load masterkey from arbitrary paths
 2026-03-12 10:23:43 +01:00
Sebastian StenzelandGitHub 02ad38f871 Merge pull request #3948 from purejava/feature/app-update 
Implement new update API
 2025-11-24 14:41:55 +01:00
Sebastian StenzelGitHubArmin Schrenk
 		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
Sebastian StenzelandGitHub bf8d5ed09f codesign .dmg (#3886) 
fixes #3885
 2025-06-10 13:39:34 +02:00
Sebastian StenzelandGitHub 3cc199227b Include AppStream metadata in AppImage (#3687) 2025-01-20 17:59:59 +01:00
Sebastian StenzelandGitHub 3d0647bce3 fix appimage build (#3686) 
* remove unsupported parameter `--sign-args`

apparently no longer wanted, despite being documented, see https://github.com/AppImage/appimagetool/issues/39

* add usr/share/metainfo/Cryptomator.appdata.xml

* appimagetool fails when adding AppStream metadata

see https://github.com/AppImage/AppImageKit/issues/603
 2025-01-18 12:18:25 +01:00
Sebastian StenzelandGitHub 910a2eace8 build AppImage on ubuntu-24.04-arm (#3681) 2025-01-17 09:08:02 +01:00
Sebastian StenzelandGitHub ee5a5c6563 Merge pull request #3291 from cryptomator/feature/legacy-device-migration 
Hub 1.2.x → Hub 1.3.x Legacy Device Migration
 2024-02-02 14:59:30 +01:00
Sebastian StenzelandGitHub 325057c548 Merge pull request #3287 from cryptomator/feature/refactored-hub-unlock 
Refactored Hub Unlock
 2024-01-17 13:32:09 +01:00
Sebastian StenzelandGitHub 5759b7e596 Merge pull request #3210 from cryptomator/feature/3203-device-already-registered 
Feature: Adjust Hub workflow, if device is already registerd
 2024-01-11 12:05:25 +01:00
Sebastian StenzelandGitHub 7d7b7c1dc9 Merge pull request #3260 from cryptomator/feature/annihilate-FUPFMS 
annihilate FUPFMS
 2024-01-11 10:25:21 +01:00
Sebastian StenzelandGitHub 5c5777ffc5 Merge pull request #3091 from cryptomator/feature/simplify-out-of-bounds 
simplify out-of-bounds check
 2023-10-20 11:56:36 +02:00
Sebastian StenzelandGitHub 8dd8b93656 Merge pull request #3041 from cryptomator/feature/new-hub-keyloading 
Adjusted to Hub 1.3.x API
 2023-10-20 11:55:28 +02:00
Sebastian StenzelandGitHub 1f21d5ea4c Merge pull request #3129 from cryptomator/feature/jdk21 
JDK 21
 2023-10-18 09:39:12 +02:00
Sebastian StenzelGitHubBas Ruigrok
 		b7da508ccc Update src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java 
Co-authored-by: Bas Ruigrok <Rexbas@proton.me>
 2023-09-18 13:19:58 +02:00
Sebastian StenzelandGitHub 9cd50e8ae4 Merge pull request #2974 from cryptomator/feature/replace-gson 
Replace GSON with Jackson
 2023-06-30 13:48:19 +02:00
Sebastian StenzelandGitHub 6bb69ea8d3 Merge branch 'develop' into libappindicator 2023-05-10 20:21:54 +02:00
Sebastian StenzelandGitHub 33ebc17619 Merge branch 'develop' into fix/2383-tray-icon-refresh 2022-11-30 11:46:36 +01:00
Sebastian StenzelandGitHub 7091839f08 Merge pull request #2505 from cryptomator/feature/javafx-19 2022-10-28 22:09:29 +02:00
Sebastian StenzelandGitHub 79bf1759c7 Merge pull request #2509 from cryptomator/feature/jdk19 2022-10-28 22:09:06 +02:00
Sebastian StenzelandGitHub 517b5958b0 Merge pull request #2487 from cryptomator/feature/ppa-jdk-19 
Use `coffeelibs-jdk-19` during PPA build
 2022-10-18 16:48:28 +02:00
Sebastian StenzelandGitHub cc24a4c9ae Merge pull request #2445 from purejava/disable-keyrings 
fixes #2047, fixes #2219
 2022-09-21 09:12:40 +02:00
Sebastian StenzelandGitHub 86ed0d3c0e Merge pull request #2390 from cryptomator/feature/slf4j-2 
Upgrade to SLF4J 2.x and Logback 1.3.x
 2022-08-12 09:53:27 +02:00
Sebastian StenzelandGitHub 1cd3d1d67f Merge pull request #2365 from purejava/fix-2301 
Pass on CLI parameters from launch scripts to executables
 2022-08-02 08:44:04 +02:00
Sebastian StenzelandGitHub f2af6f355c remove debug step 
[ci skip]
 2022-07-08 13:09:26 +02:00
Sebastian StenzelandGitHub 58d01b5bf5 fixed errors 
[ci skip]
 2022-07-08 13:07:30 +02:00
Sebastian StenzelandGitHub 5e19cd409f use different action for getting the gist 
[ci skip]
 2022-07-08 12:56:02 +02:00
Sebastian StenzelandGitHub 4dd58a664e Update error-db.yml 
add discussion data to errorcodes.json gist

[ci skip]
 2022-07-08 12:48:50 +02:00
Sebastian StenzelandGitHub 12302162b1 Update error-db.yml 
[ci skip]
 2022-07-07 17:35:48 +02:00
Sebastian StenzelandGitHub df099df334 Create error-db.yml 
Eventually append discussion data to error database
 2022-07-07 17:13:27 +02:00
Sebastian StenzelandGitHub aca55734b0 Use Xcode Notarization Action (#2267) 
[ci skip]
 2022-05-27 12:21:13 +02:00
Sebastian StenzelGitHubArmin Schrenk
 		90f523bee8 parameterize patchWebDAV.ps1 and add default values to .bat file (#2251) 
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2022-05-13 15:11:41 +02:00
Sebastian StenzelandGitHub 1151157dff Report Download Stats (#2230) 
[ci skip]
 2022-05-05 07:32:19 +02:00
Sebastian StenzelandGitHub ccd3da3b09 Merge pull request #2096 from cryptomator/feature/integrations-api-1.1.0 
Integrations API 1.1.0
 2022-04-27 15:29:47 +02:00
Sebastian StenzelandGitHub d368b01038 Merge pull request #2105 from cryptomator/feature/gtk2-launcher 
Add additional GTK2 launcher to AppImage, fixes #1432
 2022-04-18 08:24:13 +02:00
Sebastian StenzelandGitHub 752e61219c Merge pull request #2161 from cryptomator/feature/check-vaultconfig-sig-during-key-recovery 
Prevent key recovery for foreign vault
 2022-04-05 12:03:12 +02:00
Sebastian StenzelandGitHub 3136e22414 Merge pull request #2150 from cryptomator/feature/language-switcher 2022-04-04 20:59:23 +02:00
Sebastian StenzelandGitHub 0cd2ecb0b3 Merge pull request #2139 from cryptomator/feature/javafx-launcher 
Refactored Launcher Component Graph
 2022-04-02 09:59:45 +02:00
Sebastian StenzelandGitHub a558135fec Rename .exe Installer Bundle (#2145) 2022-03-31 11:03:15 +02:00
Sebastian StenzelandGitHub 88977ecf20 Merge pull request #1983 from cryptomator/feature/simplified-workflow-results 2022-03-21 21:19:32 +01:00
Sebastian StenzelandGitHub a1becd9a1f Merge pull request #2103 from cryptomator/feature/separate-release-actions 
Build binary packages in separate workflows
 2022-03-18 15:58:26 +01:00
Sebastian StenzelandGitHub 349cefcbf5 Merge pull request #2073 from cryptomator/feature/dedup-freedesktop-metadata 
Deduplicate Freedesktop Metadata
 2022-03-03 13:08:36 +01:00
Sebastian StenzelandGitHub ed1459a0f0 Update pom.xml 2022-03-01 08:49:47 +01:00
Sebastian StenzelandGitHub 5a8aacb7c0 Merge branch 'develop' into feature/dedup-freedesktop-metadata 2022-02-28 14:16:27 +01:00
Sebastian StenzelandGitHub b142904cc3 Merge pull request #1980 from cryptomator/feature/hub-integrated-device-registration 
Register device from within client application
 2021-12-16 18:02:00 +01:00
Sebastian StenzelandGitHub ae6766fa79 Merge pull request #1823 from purejava/feature/displayName 
Pass the name of the vault on storing and changing a passphrase
 2021-12-02 09:00:03 +01:00
Sebastian StenzelGitHubArmin Schrenk
 		2808d777e0 Add cryptomator-vault alias to etc/hosts during (re)install (#1914) 
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2021-11-29 16:37:23 +01:00
Sebastian StenzelandGitHub 0c47af2f15 Merge pull request #1935 from cryptomator/feature/lock-retry-loop 
Handle exception when force-locking
 2021-11-17 16:00:41 +01:00
Sebastian StenzelandGitHub c5b6d8f81f target Ubuntu Bionic in PPA release (#1909) 2021-11-10 12:20:52 +01:00
Sebastian StenzelandGitHub 6c6f6baf12 Update to JDK 17 (#1828) 
fixes #1404
 2021-10-08 14:59:24 +02:00
Sebastian StenzelandGitHub 90bceb0f68 Update to OpenJFX 17 (#1809) 
* update to openjfx 17.0.0.1
* use new javafx API instead of AWT
 2021-09-24 21:01:19 +02:00
Sebastian StenzelandGitHub 9e66f4b93e Release to PPA (#1791) 
Create a Debian source package and dput it to the cryptomator-beta staging repo
 2021-09-16 13:01:34 +02:00
Sebastian StenzelandGitHub b98691ee52 Provide version string when manually triggering a build (#1790) 
* fixed inclusion of launcher script in buildkit

* renamed variable

* version must be manually provided during workflow_dispatch
 2021-09-15 15:25:52 +02:00
Sebastian StenzelandGitHub e7b9f73516 Merge pull request #1759 from cryptomator/feature/plugin-loader 2021-08-24 19:28:59 +02:00
Sebastian StenzelandGitHub 56b80be22c Update build.yml 2021-07-23 16:01:05 +02:00
Sebastian StenzelandGitHub 6da26b09b6 Merge pull request #1688 from cryptomator/feature/modular 
Add module-info.java
 2021-07-19 16:08:45 +02:00
Sebastian StenzelandGitHub 1ab4aa94b3 Merge branch 'develop' into feature/modular 2021-07-19 15:54:02 +02:00
Sebastian StenzelandGitHub 9eaf700b87 Merge pull request #1719 from cryptomator/feature/1589-unix-sockets 
Changed IPC to Unix domain sockets, fixes #1589, fixes #1716
 2021-07-15 11:42:46 +02:00
Sebastian StenzelandGitHub cf7a2db7ec Merge branch 'develop' into feature/modular 2021-07-06 13:19:07 +02:00
Sebastian StenzelandGitHub 58376bddef Merge pull request #1685 from cryptomator/feature/provider-agnostic-keychains 
Remove all references to specific keychain access providers
 2021-06-08 14:42:56 +02:00
Sebastian StenzelGitHubCryptobot
 		04c13ba242 New Crowdin updates (#1677) 
[ci skip]

Co-authored-by: Cryptobot <cryptobot@users.noreply.github.com>
 2021-06-04 21:00:56 +02:00
Sebastian StenzelandGitHub 7fac6da448 Single maven module (#1676) 
combined all sources into single maven module
 2021-06-04 20:09:10 +02:00
Sebastian StenzelandGitHub 72bd9c1fdf New Crowdin updates (#1643) 
[ci skip]
 2021-06-04 15:44:48 +02:00
Sebastian StenzelandGitHub 39b8e25f4f Merge pull request #1596 from eas5/test_improvement 
Improved grouped assertions
 2021-06-04 15:42:16 +02:00
Sebastian StenzelandGitHub 95b98b8a36 Merge pull request #1603 from cryptomator/feature/autoLock 
fixes #274
 2021-06-02 16:24:26 +02:00
Sebastian StenzelandGitHub 18152e4f3d Merge branch 'develop' into feature/autoLock 2021-06-02 14:31:28 +02:00
Sebastian StenzelandGitHub 0ce41e7ac3 New Crowdin updates (#1628) 
New translations strings.properties

Japanese; Polish; Spanish; Dutch; Czech; Norwegian Bokmal; Korean; Greek; Catalan; Slovak; Russian; Punjabi; Italian; Arabic; Bosnian; Hungarian; German; Cyrillic); Latin); Romanian; French; Chinese Simplified; Croatian; Chinese Traditional; Portuguese; Latvian; Hindi; Indonesian; Turkish; Portuguese, Brazilian; Swedish; Norwegian Nynorsk; 

[ci skip]
 2021-05-06 14:25:59 +02:00
Sebastian StenzelandGitHub 9c2c234bee New Crowdin updates (#1604) 
New translations strings.properties

Slovak; Czech; Italian; French; Catalan; Romanian; Polish; Chinese Simplified; Dutch; Chinese Traditional;
Norwegian Nynorsk; Croatian; Turkish; German; Spanish; Russian; Hungarian; Punjabi; Portuguese;
Norwegian Bokmal; Indonesian; Hindi; Bosnian; Cyrillic); Swedish; Greek; Korean; Portuguese, Brazilian; Latin); Arabic; Latvian; Japanese; 

[ci skip]
 2021-04-21 12:01:09 +02:00
Sebastian StenzelandGitHub ebccb61750 New Crowdin updates (#1560) 2021-03-31 09:46:45 +02:00
Sebastian StenzelandGitHub 31e938de6a Merge pull request #1587 from cryptomator/feature/jdk-16 
Update to JDK 16
 2021-03-17 12:29:29 +01:00
Sebastian Stenzel 9f86b74320 New translations strings.properties (Greek) 
[ci skip]
 2021-02-23 09:32:09 +01:00
Sebastian Stenzel 2d8390a0f3 New translations strings.properties (Chinese Simplified) 
[ci skip]
 2021-02-22 11:47:50 +01:00
Sebastian Stenzel 8d3671175f New translations strings.properties (Swedish) 
[ci skip]
 2021-02-21 16:16:10 +01:00
Sebastian Stenzel 366011a222 New translations strings.properties (Swedish) 
[ci skip]
 2021-02-21 15:45:39 +01:00
Sebastian Stenzel c0c2e21055 New translations strings.properties (Korean) 
[ci skip]
 2021-02-20 02:29:34 +01:00
Sebastian Stenzel 63be96a151 New translations strings.properties (Korean) 
[ci skip]
 2021-02-20 01:58:05 +01:00
Sebastian Stenzel fc1df4bd99 New translations strings.properties (Catalan) 
[ci skip]
 2021-02-19 21:46:49 +01:00
Sebastian Stenzel 7657330931 New translations strings.properties (German) 
[ci skip]
 2021-02-19 13:17:33 +01:00
Sebastian Stenzel 4e44de3c3b New translations strings.properties (Portuguese, Brazilian) 
[ci skip]
 2021-02-19 01:07:24 +01:00
Sebastian Stenzel 8d902a72ca New translations strings.properties (Turkish) 
[ci skip]
 2021-02-18 19:39:40 +01:00
Sebastian Stenzel 7378031a72 New translations strings.properties (Spanish) 
[ci skip]
 2021-02-18 17:15:20 +01:00
Sebastian Stenzel f898c07c27 New translations strings.properties (German) 
[ci skip]
 2021-02-18 16:41:50 +01:00
Sebastian Stenzel c8f02d1045 New translations strings.properties (Czech) 
[ci skip]
 2021-02-18 14:56:07 +01:00
Sebastian Stenzel 4cc13b986b New translations strings.properties (Slovak) 
[ci skip]
 2021-02-18 14:22:12 +01:00
Sebastian Stenzel af7b6780f3 New translations strings.properties (Italian) 
[ci skip]
 2021-02-18 14:22:10 +01:00
Sebastian Stenzel 4a17d01004 New translations strings.properties (French) 
[ci skip]
 2021-02-18 13:42:57 +01:00
Sebastian Stenzel 1d68408e21 New translations strings.properties (Japanese) 
[ci skip]
 2021-02-18 13:42:49 +01:00
Sebastian Stenzel 821b1ee660 New translations strings.properties (Russian) 
[ci skip]
 2021-02-18 13:42:45 +01:00
Sebastian Stenzel c6616bd467 New translations strings.properties (Slovak) 
[ci skip]
 2021-02-18 13:42:44 +01:00
Sebastian Stenzel 4bb2589f16 New translations strings.properties (Polish) 
[ci skip]
 2021-02-18 13:42:37 +01:00
Sebastian Stenzel 896c3b3565 New translations strings.properties (Norwegian Bokmal) 
[ci skip]
 2021-02-18 13:09:32 +01:00
Sebastian Stenzel 6ee717a693 New translations strings.properties (French) 
[ci skip]
 2021-02-18 13:09:31 +01:00
Sebastian Stenzel 07ec858e1e New translations strings.properties (Spanish) 
[ci skip]
 2021-02-18 13:09:29 +01:00
Sebastian Stenzel a7c1e43ebc New translations strings.properties (Arabic) 
[ci skip]
 2021-02-18 13:09:28 +01:00
Sebastian Stenzel ac1cd3b073 New translations strings.properties (Catalan) 
[ci skip]
 2021-02-18 13:09:27 +01:00
Sebastian Stenzel 7474519faf New translations strings.properties (Czech) 
[ci skip]
 2021-02-18 13:09:26 +01:00
Sebastian Stenzel 340e474c33 New translations strings.properties (German) 
[ci skip]
 2021-02-18 13:09:24 +01:00
Sebastian Stenzel c90ab75427 New translations strings.properties (Greek) 
[ci skip]
 2021-02-18 13:09:23 +01:00
Sebastian Stenzel 848b3f77d3 New translations strings.properties (Hungarian) 
[ci skip]
 2021-02-18 13:09:21 +01:00