Commit Graph

174 Commits

Author SHA1 Message Date
Armin Schrenk
be7b265a00
Merge branch 'main' into develop
# Conflicts:
#	pom.xml
2023-08-07 10:27:13 +02:00
Armin Schrenk
9ae9473b95
finalize 1.9.3 2023-08-07 10:19:04 +02:00
Armin Schrenk
1a153e1f6e
Merge branch 'develop' into libappindicator 2023-07-26 14:18:42 +02:00
Armin Schrenk
108df3ddbc
Merge branch 'main' into develop
# Conflicts:
#	pom.xml
#	suppression.xml
2023-07-24 16:38:18 +02:00
Armin Schrenk
164a350e7e
finalize 1.9.2 2023-07-24 16:34:49 +02:00
Armin Schrenk
f1d4bd4cd4
Closes #2989 2023-07-13 12:22:46 +02:00
Ralph Plawetzki
9e25d0fcc0
Define property in a single line 2023-07-13 06:43:32 +02:00
Ralph Plawetzki
da8410842b
Change showTrayIcon to true for all Linux builds 2023-07-11 19:56:22 +02:00
Ralph Plawetzki
b75459fbc6
Revert "Find native libraries on the system"
This reverts commit 58bb266085.
2023-07-09 19:47:52 +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
3ae847d5ad
Code improvements and changes
Discussion: https://github.com/cryptomator/integrations-linux/pull/22#pullrequestreview-1479004107
2023-06-15 06:46:05 +02:00
Ralph Plawetzki
58bb266085
Find native libraries on the system 2023-06-14 11:20:15 +02:00
Ralph Plawetzki
c8ed30574a
Introduce JVM property for the SVG image loading path 2023-06-14 06:02:03 +02:00
Armin Schrenk
b296dc775c
finalize 1.9.1 2023-06-07 12:55:28 +02:00
Ralph Plawetzki
1cb5a3531a
Fix symlinks for icons installed with the ppa 2023-06-06 19:44:02 +02:00
Ralph Plawetzki
d5cad1a704
Lost+found
Things I forgot or could be more simple
2023-06-05 19:13:25 +02:00
Sebastian Stenzel
c9dd7454f5
Merge branch 'develop' into feature/libappindicator
# Conflicts:
#	pom.xml
2023-06-04 20:40:03 +02:00
Sebastian Stenzel
7a7332a3f6
remove executable bit 2023-06-04 14:29:17 +02:00
Sebastian Stenzel
a22bfacfa2
create symlinks from "symbolic" to "scalable" icons 2023-06-04 14:18:05 +02:00
Ralph Plawetzki
641b21a144
Symbolic icons for the ppa 2023-06-02 06:31:35 +02:00
Armin Schrenk
9d573c497e
finalize 1.9.0 2023-05-30 10:34:51 +02:00
Ralph Plawetzki
c8cfe473f1
Set icons by icon name
Needed for icons to work on Mate DE
2023-05-29 15:55:01 +02:00
Ralph Plawetzki
1093cb618f
Remove double setting symbolic links 2023-05-25 18:56:04 +02:00
Ralph Plawetzki
8c05c774bf
Remove unneeded cp launcher.sh 2023-05-25 18:15:39 +02:00
Ralph Plawetzki
6af9132721
Add tray icons to AppImage build script 2023-05-25 18:07:13 +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
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
085f762a35
further fixing debian 2023-05-09 15:48:06 +02:00
Armin Schrenk
d4cba2fd6e
fix errors 2023-05-09 09:55:56 +02:00
Ralph Plawetzki
2d17ad9a2e
Add SVG icons to Linux build scripts 2023-05-06 17:36:39 +02:00
Ralph Plawetzki
5502f58637
Move SVG icons for Linux to the right location 2023-05-06 17:29:48 +02:00
Armin Schrenk
d1270ceeb2
finalize 1.8.0 2023-04-25 10:44:41 +02:00
Julian Raufelder
a1d5b8a4e2
Prepare 1.7.5 2023-04-07 11:39:21 +02:00
Armin Schrenk
c3f654b454
finalize release 2023-04-05 09:56:34 +02:00
Armin Schrenk
bebae14744
finalize release 2023-03-15 13:51:09 +01:00
Armin Schrenk
2328a5e3a8
finalize release 2023-03-07 12:19:35 +01:00
Armin Schrenk
33e1cb3131
finalize release 2023-03-03 16:19:37 +01:00
Armin Schrenk
f0d597ba73
require fuse3 packge for deb to have fusermount3 2023-03-01 19:28:40 +01:00
Armin Schrenk
c6a9af1a04
update metainfo.xml 2023-03-01 12:03:03 +01:00
Armin Schrenk
69d73d0fb9
Remove standalone launchers 2023-02-03 13:15:03 +01:00
Armin Schrenk
40fbe4f59d
remove more libffi workaround leftovers 2023-01-26 16:05:53 +01: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
Armin Schrenk
1c104737c1
Merge pull request #2639 from cryptomator/feature/mount-provider
Refactoring: Use mount service
2023-01-26 13:20:11 +01:00
Ralph Plawetzki
8139cb8c38
Add jdk.security.auth module to rules 2023-01-22 20:05:13 +01:00
Ralph Plawetzki
f1f5f7e02f
Add jdk.security.auth module as it's required by dbus-java-core 2023-01-22 17:59:20 +01:00
Armin Schrenk
90408504e2
Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	pom.xml
#	src/main/java/org/cryptomator/common/vaults/Vault.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
2023-01-20 15:27:48 +01:00
Armin Schrenk
24d472ed8b
Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
2023-01-11 16:01:27 +01:00
Ralph Plawetzki
0e0e00f116
Remove stuff not needed when run locally
From: changes requested for PR #2624
2023-01-08 14:10:38 +01:00
Ralph Plawetzki
77c0a3e265
Update build.sh to .github/workflows/appimage.yml 2023-01-07 15:31:32 +01:00
Julian Raufelder
9182c415eb
Hello 2023 🎉 2023-01-04 13:35:58 +01:00
Armin Schrenk
fd5aeaf90a Merge branch 'develop' into feature/mount-setting-per-vault 2023-01-02 13:47:30 +01:00
Armin Schrenk
8009205da7
Merge branch 'main' into develop
# Conflicts:
#	pom.xml
2022-12-14 20:07:24 +01:00
Armin Schrenk
fd76c89393
update metainfo 2022-12-14 20:02:12 +01:00
Sebastian Stenzel
4fda4a2b2e
fix makefile 2022-12-12 09:09:25 +01:00
Sebastian Stenzel
ffaf7ad360
adjust package dependencies to new mount api and jfuse 2022-12-12 09:03:56 +01:00
Sebastian Stenzel
76689705f5
remove LD_PRELOAD workaround, which should no longer be required with jfuse 2022-12-12 08:54:18 +01:00
Armin Schrenk
36ed4554b2
Fixes #2570
Dabian build: Make libffi7 a runtime dependency and preload it.
2022-12-09 15:12:04 +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
Armin Schrenk
0e9b115647
debian build: use correct package names 2022-12-07 11:43:59 +01:00
Armin Schrenk
5ba137dda5
Add additional build dependencies to debian build 2022-12-07 11:11:31 +01:00
Sebastian Stenzel
db928ba034
try fixing debian build 2022-12-06 20:49:09 +01:00
Armin Schrenk
d8b71db8e5
bump metainfo.xml 2022-12-06 15:27:17 +01:00
Sebastian Stenzel
ba7029968d try fixing dpkg-shlibdeps: error: cannot find library libgtk-x11-2.0.so.0 ... 2022-11-30 11:16:38 +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
1f01923169
build on Ubuntu Focal 2022-10-14 13:44:50 +02:00
Sebastian Stenzel
6367cc2dfb
depend on coffeelibs-jdk-19 2022-10-14 13:10:37 +02:00
Julian Raufelder
26ecd67a79
Update linux common metainfo.xml file 2022-10-11 15:33:44 +02:00
Armin Schrenk
67dd1548cc
finalize release 2022-08-31 15:47:23 +02:00
Ralph Plawetzki
8290df9ea6
Pass on CLI parameters for Cryptomator started as an AppImage or installed from PPA
Fixes #2301
2022-08-01 18:17:41 +02:00
Armin Schrenk
57110ff417
add release to metainfo 2022-07-27 11:57:45 +02:00
Armin Schrenk
d5bdea4a75
fix debian build script
Fixes #2352
2022-07-27 11:57:00 +02:00
Armin Schrenk
9209e7698c
add release info to linux metainfo file 2022-07-26 13:23:31 +02:00
Armin Schrenk
45f038bae2
Merge branch 'develop' into feature/hub
# Conflicts:
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
#	pom.xml
2022-06-22 09:55:02 +02:00
Julian Raufelder
12ef32835c
Prepare 1.6.10
[ci skip]
2022-05-03 16:15:33 +02:00
Sebastian Stenzel
9f0e269baf
Merge branch 'develop' into feature/hub
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
2022-04-28 12:55:55 +02:00
Julian Raufelder
d127121007
Update metainfo.xml to 1.6.9
[ci skip]
2022-04-26 19:51:43 +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
2ce7e84e3c
Merge branch 'develop' into feature/gtk2-launcher 2022-04-04 06:58:07 +02:00
Sebastian Stenzel
ec2524f6ff
use correct StartupWMClass (fixes #1955)
[ci skip]
2022-04-02 10:06:15 +02:00
Sebastian Stenzel
828f32d3f6
Merge branch 'develop' into feature/gtk2-launcher 2022-03-31 08:57:27 +02:00
Julian Raufelder
732fc2f3dd
Update metainfo.xml to 1.6.8
[ci skip]
2022-03-30 17:17:48 +02:00
Sebastian Stenzel
504a384225
fix envsubst 2022-03-18 17:58:21 +01:00
Sebastian Stenzel
b565f1d0c0
remove unused java binaries from jlinked runtime image 2022-03-18 17:26:28 +01:00
Sebastian Stenzel
fab70ef8c9
run Cryptomator binaries instead of java from AppImage launcher .sh 2022-03-18 17:25:04 +01:00
Ralph Plawetzki
a32f5bb6d9 Use updated Cryptomator screenshots (1.6.5)
They do appstream-util validate
2022-03-07 11:59:54 +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
Sebastian Stenzel
f7c4fc5fda
fix .deb binary build 2022-02-28 11:00:08 +01:00
Sebastian Stenzel
8ee47aad0f
remove version entirely (should have been 1.0, but not required) 2022-02-25 09:58:47 +01:00
Sebastian Stenzel
6553e48ea3
use oars-1.1 as suggested by @x80486 2022-02-25 09:33:15 +01:00