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

56 Commits

Author SHA1 Message Date
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
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
Armin Schrenk
75093f1c09 Make lauchner class configurable 2022-05-12 16:12:20 +02:00
Armin Schrenk
3e6d81ef1b Use parameter for main jar glob pattern 2022-05-12 09:15:04 +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
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
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
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
Sebastian Stenzel
2108a77e12 adjusted build scripts for Cryptomator Hub 2022-04-08 20:45:22 +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
Armin Schrenk
1a0624cc81 Closes #2130 
Prevent Windows installation if app is running
 2022-03-29 23:47:03 +02:00
Sebastian Stenzel
b565f1d0c0 remove unused java binaries from jlinked runtime image 2022-03-18 17:26:28 +01:00
Armin Schrenk
df7d9ba79e Update winfsp download links 2022-03-01 15:25:00 +01:00
Armin Schrenk
467d9e56a0 remove resolved TODO 2022-02-25 13:24:58 +01:00
Armin Schrenk
771e3ab6f3 remove unused ui elements from theme bundle 2022-02-24 09:53:26 +01:00
Armin Schrenk
7172462b4b Create installation bundle with winfsp: 
* via wix burn engine
* licenses generated on the fly
* customized theme
* local only
 2022-02-23 22:27:41 +01:00
Sebastian Stenzel
d6ccb41027 add modules required for JFR 2022-01-26 19:47:51 +01:00
httpjamesm
f1fdd7960c Update copyright years from 2021 to 2022 to reflect the new year (#2015) 2022-01-10 10:01:07 +01:00
Armin Schrenk
bf382d928f Update dokan.dll [ci skip] 2022-01-05 10:53:18 +01:00
Armin Schrenk
eee672f9ee closes #1932, closes #1931 2021-12-01 13:53:51 +01:00
Sebastian Stenzel
9f4a7c8cce renamed scripts 2021-12-01 12:35:01 +01:00
Sebastian Stenzel
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 Stenzel
71a575e079 add build scripts for windows 
[ci skip]
 2021-11-10 16:08:11 +01:00
Armin Schrenk
28d2262962 on windows allow installations only on windows 10 1803 or newer due to unix socket support 2021-10-22 19:21:10 +02:00
Armin Schrenk
ec72762548 fix windows installer 2021-10-19 18:45:25 +02:00
Armin Schrenk
d241f022ab Merge branch 'develop' into release/1.6.0 
# Conflicts:
#	pom.xml
 2021-09-22 16:36:36 +02:00
Armin Schrenk
e482574aaf Block windows installation if old innosetup version is installed 2021-09-15 12:16:25 +02:00
Armin Schrenk
bbb30ebe0f keep name of icon file 2021-09-03 12:54:24 +02:00
Armin Schrenk
869407cded Win installer: use different icon file for Cryptomator files and make c9r/c9s file extensions non executing 2021-09-02 13:30:12 +02:00
Armin Schrenk
b710fd33ce updating third party license file 2021-08-16 15:27:06 +02:00
Armin Schrenk
12720d67e8 Revert "windows installer: disallow downgrades, allow upgrades" 
This reverts commit 4b9ae03bc2.
 2021-08-12 15:07:53 +02:00
Armin Schrenk
d319b45fce add file associations for msi installer 2021-08-12 14:43:10 +02:00