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,138 Commits 36 Branches 214 Tags
a30db34c1994e94de85f8e8fc59166add04424d3
Commit Graph

299 Commits

Author SHA1 Message Date
Armin Schrenk
9d02035263 Merge branch 'develop' into release/1.10.0 2023-08-09 21:04:54 +02:00
Armin Schrenk
abdc8672f1 update org.openjdk:javafx from 20.0.1 to 20.0.2 2023-08-09 20:41:14 +02:00
Armin Schrenk
333c7457ca bump org.cryptomator:cryptofs from 2.6.6 to 2.6.7 2023-08-09 20:23:51 +02:00
Armin Schrenk
d08d992768 Bump integrations-win to 1.2.2 2023-08-02 09:44:31 +02:00
Armin Schrenk
7f0c92e2f0 Bump integrations-linux to 1.3.0-beta6 
Fixes #3020
 2023-08-02 09:44:18 +02:00
Armin Schrenk
1a153e1f6e Merge branch 'develop' into libappindicator 2023-07-26 14:18:42 +02:00
Armin Schrenk
b0a7c23055 correct comment 2023-07-26 14:16:07 +02:00
Armin Schrenk
6efb839fd0 prepare 1.10.0 2023-07-24 15:00:28 +02:00
Armin Schrenk
bd932b1067 Fixes #3021 2023-07-18 17:06:03 +02:00
Armin Schrenk
238aaeb5a0 bump integrations-api to stable version 2023-07-18 12:40:06 +02:00
Ralph Plawetzki
3d0741f4d2 Use version 1.3.3 of appindicator-gtk3-java 2023-07-09 19:48:52 +02:00
Sebastian Stenzel
ca6c1e244c use correct integrations API version 2023-07-03 10:40:50 +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
Sebastian Stenzel
9cd50e8ae4 Merge pull request #2974 from cryptomator/feature/replace-gson 
Replace GSON with Jackson
 2023-06-30 13:48:19 +02:00
Sebastian Stenzel
e23c0c23c9 remove GSON from dependencies 2023-06-29 22:44:22 +02:00
Armin Schrenk
c6c292b505 bump google guava to 32.0.1 2023-06-29 12:39:19 +02:00
Sebastian Stenzel
b2a184bdf0 ignore unknown fields during JWT deserialization 2023-06-29 12:02:33 +02:00
Armin Schrenk
da0eeb2e45 bump dependency-check 2023-06-07 12:50:24 +02:00
Armin Schrenk
ff49094f35 fixes #2936 2023-06-07 12:50:09 +02:00
Sebastian Stenzel
c9dd7454f5 Merge branch 'develop' into feature/libappindicator 
# Conflicts:
#	pom.xml
 2023-06-04 20:40:03 +02:00
Ralph Plawetzki
20664ff3d3 1.3.0-beta3 is available 2023-06-02 05:42:04 +02:00
Armin Schrenk
40abf582c5 bump guava 2023-06-01 17:48:14 +02:00
Armin Schrenk
81c12f50fe Merge branch 'main' into develop [ci skip] 2023-05-30 10:46:07 +02:00
Armin Schrenk
0c0060262a prepare 1.9.0 2023-05-26 16:37:53 +02:00
Armin Schrenk
9af4ffe83b use correct webdav adapter version 2023-05-26 15:44:10 +02:00
Armin Schrenk
c6f963793d bump dependencies 2023-05-26 13:10:11 +02:00
Ralph Plawetzki
1f443453c7 Modify copy-dependencies for new modules 
Fix java.lang.module.FindException: Module jdk.net not found, required by org.freedesktop.dbus.transport.jre
Enable native access for module org.purejava.appindicator
 2023-05-25 17:32:06 +02:00
Ralph Plawetzki
71caefbe70 Rename icons and bring them in place 2023-05-25 11:23:24 +02:00
Sebastian Stenzel
6bb69ea8d3 Merge branch 'develop' into libappindicator 2023-05-10 20:21:54 +02:00
Ralph Plawetzki
6e858746c1 Keep change to JDK 20 outside of this PR 2023-05-10 06:35:52 +02:00
Ralph Plawetzki
8b94c82889 Use icons provided by tobihagemann 2023-05-10 06:23:57 +02:00
Ralph Plawetzki
fbe997e6c4 Revert "Use second icon too provided by tobihagemann" 
This reverts commit 491fdaa9bb.
 2023-05-10 05:44:53 +02:00
Ralph Plawetzki
491fdaa9bb Use second icon too provided by tobihagemann 2023-05-09 19:52:41 +02:00
Armin Schrenk
a3f05db189 bump javafx 2023-05-08 19:41:02 +02:00
Armin Schrenk
151ef6c7b2 upgrade to jdk20 
* use pattern matching preview feature
* bump fuse-nio-adapter
 2023-05-08 19:12:35 +02:00
Ralph Plawetzki
948a62b482 Code improvements continued 
Discussion: https://github.com/cryptomator/integrations-linux/pull/18
 2023-05-06 09:18:47 +02:00
Ralph Plawetzki
317f3c3458 Move stuff to integrations-linux 2023-04-30 17:08:08 +02:00
Ralph Plawetzki
97cede12b7 Update to JDK 20 2023-04-27 18:39:46 +02:00
Ralph Plawetzki
6da107f4db Add AppindicatorTrayMenuController 2023-04-26 18:24:01 +02:00
Armin Schrenk
aa03bd119a Merge branch 'main' into develop 2023-04-25 10:45:51 +02:00
Armin Schrenk
901a290dd9 prepare 1.8.0 2023-04-24 17:35:25 +02:00
Julian Raufelder
cd0c6fbd33 Merge branch 'hotfix/1.7.5' into develop 2023-04-07 11:45:08 +02:00
Julian Raufelder
a1d5b8a4e2 Prepare 1.7.5 2023-04-07 11:39:21 +02:00
Julian Raufelder
34e430aff6 Revert "bump cryptofs" 
This reverts commit db2560fccf.
 2023-04-07 11:35:38 +02:00
Armin Schrenk
d1d990d47c prepare 1.7.4 2023-04-04 18:17:24 +02:00
Armin Schrenk
db2560fccf bump cryptofs 2023-04-04 13:44:19 +02:00
Armin Schrenk
b7fc03213d bump fuse-nio-adapter 
Fixes #2801
 2023-03-30 11:28:07 +02:00
Armin Schrenk
ea2a48771f Closes #2829 2023-03-29 12:03:35 +02:00
Armin Schrenk
42a1913c17 Fixes #2797 and fixes #2760 2023-03-15 13:42:03 +01:00