Armin Schrenk
9209e7698c
add release info to linux metainfo file
2022-07-26 13:23:31 +02:00
Armin Schrenk
8662abae5a
Merge branch 'feature/hub' into develop
...
# Conflicts:
# .idea/runConfigurations/Cryptomator_Windows.xml
# .idea/runConfigurations/Cryptomator_Windows_Dev.xml
# dist/win/build.ps1
# src/main/java/org/cryptomator/common/Environment.java
2022-07-26 12:29:33 +02:00
Armin Schrenk
f7ddb6e714
Update and deduplicate winfsp download link
...
Fixes #2117
2022-07-18 14:56:39 +02:00
Armin Schrenk
d814c1cfca
Update integrations-win lib ( #2331 )
...
* update to integrations-win 1.1.2
* refactor environment class to reduce maintenance
* fix test
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-07-11 15:59:54 +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
Tobias Hagemann
5233e6b690
improved cleanup in manual build script for macos
...
[ci skip]
2022-05-17 18:33:02 +02:00
Sebastian Stenzel
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
Tobias Hagemann
78bb996072
updated integrations-mac dependency
2022-05-13 13:42:40 +02:00
Tobias Hagemann
773a5d3570
Merge pull request #2244 from cryptomator/feature/parameterize-mac-build-script
...
Parameterized macOS build script
2022-05-12 16:19:14 +02:00
Armin Schrenk
75093f1c09
Make lauchner class configurable
2022-05-12 16:12:20 +02:00
Tobias Hagemann
0351595243
parameterized MODULE_AND_MAIN_CLASS
2022-05-12 16:07:47 +02:00
Armin Schrenk
3e6d81ef1b
Use parameter for main jar glob pattern
2022-05-12 09:15:04 +02:00
Tobias Hagemann
852daaa88e
parameterized mac build script
2022-05-12 09:14:10 +02:00
Armin Schrenk
7dfc4d9ded
allow custom name for c9r/c9s icon file
2022-05-12 09:14:03 +02:00
Armin Schrenk
80696972cb
allow upgrade-uuid to be customized in build script
2022-05-11 13:00:32 +02:00
Armin Schrenk
0f88e6c2fe
fix errors
2022-05-11 12:48:56 +02:00
Armin Schrenk
3524f273de
Merge branch 'develop' into feature/parameterize-win-build-script
...
# Conflicts:
# dist/win/build.ps1
2022-05-11 12:48:31 +02:00
Armin Schrenk
fb3d64c43f
update integrations-win dependency
2022-05-11 12:41:33 +02:00
Armin Schrenk
90d43f28d9
eradicate last hard coded app name occurences in build script
2022-05-11 12:25:53 +02:00
Armin Schrenk
a29f10a504
refactor build scipt to be easiert customizable
2022-05-11 12:22:29 +02:00
Armin Schrenk
6702747652
separate cryptomator labels and asset paths from installer file
2022-05-10 18:35:04 +02:00
Armin Schrenk
a8b920698d
Generify error message in installer
2022-05-10 16:32:59 +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
Sebastian Stenzel
0a8cc7ed1e
Merge branch 'develop' into release/1.6.9
2022-04-27 13:19:41 +02:00
Sebastian Stenzel
3c376c4bf6
add -Dsun.java2d.metal=true, which fixes #2194
2022-04-27 13:18:25 +02:00
Armin Schrenk
8f97235b9a
Merge pull request #2189 from cryptomator/feature/on-the-fly-license
...
Generate app license on release/ installer build and remove commited third party file
2022-04-27 13:05:53 +02:00
Julian Raufelder
d127121007
Update metainfo.xml to 1.6.9
...
[ci skip]
2022-04-26 19:51:43 +02:00
Armin Schrenk
98b3b14e6a
Reverted bundle license to show links again and adjusted license template
...
* only those are depicted as clickable http links
2022-04-26 17:48:05 +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
Tobias Hagemann
4d7e16d58e
updated license templates
2022-04-22 12:34:25 +02:00
Armin Schrenk
2f17d80fe6
Revert "removed license dir, renamed merge file and adjusted paths"
...
This reverts commit d053367f83
2022-04-22 11:51:22 +02:00
Armin Schrenk
d053367f83
removed license dir, renamed merge file and adjusted paths
2022-04-22 09:49:04 +02:00
Armin Schrenk
c1801e3d22
fixed typo
2022-04-20 12:12:25 +02:00
Armin Schrenk
bff0194f3e
Fixed wrong file format and url of lcense merge file
2022-04-20 12:12:00 +02:00
Armin Schrenk
4d1d6f449e
Apply suggestions from code review
...
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-04-20 10:31:25 +02:00
Armin Schrenk
51d715caa1
apply same config to license generation
2022-04-19 16:47:33 +02:00
Tobias Hagemann
dc3894290b
updated license template for macos, fixed manual build script
2022-04-14 13:52:10 +02:00
Armin Schrenk
597bbdbdb8
for mac build generate license on the fly
...
References 7172462b4b
2022-04-13 17:53:44 +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
27d4e00210
Merge branch 'develop' into feature/gtk2-launcher
2022-04-02 10:01:25 +02:00
Armin Schrenk
a4c50da222
replicate naming scheme of win exe installer in CI job to local build
2022-03-31 11:12:50 +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
Armin Schrenk
1a0624cc81
Closes #2130
...
Prevent Windows installation if app is running
2022-03-29 23:47:03 +02:00
Sebastian Stenzel
67e1626de0
Merge branch 'develop' into feature/gtk2-launcher
2022-03-23 10:56:01 +01:00
Sebastian Stenzel
77e2be22de
updated .gitignore
...
[ci skip]
2022-03-18 18:06:31 +01:00
Sebastian Stenzel
504a384225
fix envsubst
2022-03-18 17:58:21 +01:00
