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

309 Commits

Author SHA1 Message Date
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
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
349cefcbf5 Merge pull request #2073 from cryptomator/feature/dedup-freedesktop-metadata 
Deduplicate Freedesktop Metadata
 2022-03-03 13:08:36 +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
Armin Schrenk
df7d9ba79e Update winfsp download links 2022-03-01 15:25:00 +01:00
Sebastian Stenzel
5a8aacb7c0 Merge branch 'develop' into feature/dedup-freedesktop-metadata 2022-02-28 14:16:27 +01:00
Sebastian Stenzel
f7c4fc5fda fix .deb binary build 2022-02-28 11:00:08 +01:00
Armin Schrenk
467d9e56a0 remove resolved TODO 2022-02-25 13:24:58 +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
Sebastian Stenzel
10999b2725 renamed .appdata.xml to .metainfo.xml as suggested by @x80486 2022-02-25 09:28:58 +01:00
Sebastian Stenzel
02fe63c7bc version of the spec, not version of the software 
see https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
 2022-02-25 09:28:14 +01:00
Sebastian Stenzel
7d9aab46a8 fix broken path during mimetype installation 2022-02-24 16:27:28 +01:00
Sebastian Stenzel
69ff0e44f5 fix build 2022-02-24 12:00:02 +01:00
Sebastian Stenzel
ec1c255bb4 update appstream metadata 2022-02-24 10:56:36 +01:00
Sebastian Stenzel
43e936d117 rename mimetype file 2022-02-24 10:56:23 +01:00
Sebastian Stenzel
90da61e495 adjust ppa build to use "common" resources 2022-02-24 10:41:40 +01:00