Commit Graph

3686 Commits

Author SHA1 Message Date
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
0b2685f271
adjusted .gitignore to latest IntelliJ IDEA standards
see https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems

[ci skip]
2022-05-10 15:23:02 +02:00
Sebastian Stenzel
120be431ee
prepare Cryptomator to eventually change the update check URL 2022-05-10 11:36:40 +02:00
Armin Schrenk
f50eb1f047
Revert "Reset webdavport field if changes are not applied and focus lost"
This reverts commit c6e9e33feb.
2022-05-09 13:06:15 +02:00
Armin Schrenk
32d6661a72
Merge pull request #2235 from cryptomator/feature/automate-winget
Add automatic release to winget to msi/exe ci job
2022-05-06 17:44:33 +02:00
Armin Schrenk
f57d8dab6d
instead of defining pwsh as default for winget job, only use it in specific step 2022-05-06 17:34:04 +02:00
Armin Schrenk
5ba0e674f2
Add automatic release to winget to msi/exe ci job 2022-05-06 13:13:45 +02:00
Sebastian Stenzel
55f67785cd
don't cause the job to fail if the upload fails
[ci skip]
2022-05-05 09:05:05 +02:00
Sebastian Stenzel
6d082330e6
replace failing curl with http-request-action
[ci skip]
2022-05-05 08:00:21 +02:00
Sebastian Stenzel
0fdc5b2826
fix duplicate arm64 dmg and duplicate appimage
[ci skip]
2022-05-05 07:50:06 +02:00
Sebastian Stenzel
31f77e62ea
configurable time interval 2022-05-05 07:44:28 +02:00
Sebastian Stenzel
3435a6701a
round timestamp to latest 15min mark 2022-05-05 07:41:36 +02:00
Sebastian Stenzel
d4367b97a6
adjust interval to 900s, when reporting stats every 15min 2022-05-05 07:39:05 +02:00
Sebastian Stenzel
1151157dff
Report Download Stats (#2230)
[ci skip]
2022-05-05 07:32:19 +02:00
Julian Raufelder
e9c58ac3d5
Merge branch 'hotfix/1.6.10' into develop 2022-05-03 16:38:51 +02:00
Julian Raufelder
12ef32835c
Prepare 1.6.10
[ci skip]
2022-05-03 16:15:33 +02:00
Julian Raufelder
eae5f4d870
Fix truncation if new size is larger than the current file size when FUSE is used to mount the vault
Fixes #2218
2022-05-03 16:10:41 +02:00
JaniruTEC
30e1c989d0
Fixed typo 2022-05-01 00:46:36 +02:00
Armin Schrenk
c6e9e33feb
Reset webdavport field if changes are not applied and focus lost 2022-04-28 12:00:06 +02:00
Armin Schrenk
62c7f95f7c
removed logging of unused property 2022-04-28 11:54:51 +02:00
Armin Schrenk
a304427973
Remove last reference of "donationkey" 2022-04-28 11:53:54 +02:00
Sebastian Stenzel
c04597eca5
Merge branch 'main' into develop
[ci skip]
2022-04-27 15:52:15 +02:00
Sebastian Stenzel
ba1945ebb8 Merge branch 'release/1.6.9' 2022-04-27 15:51:50 +02:00
Sebastian Stenzel
e9551a076d
Merge branch 'develop' into release/1.6.9 2022-04-27 15:30:59 +02:00
Sebastian Stenzel
ccd3da3b09
Merge pull request #2096 from cryptomator/feature/integrations-api-1.1.0
Integrations API 1.1.0
2022-04-27 15:29:47 +02:00
Sebastian Stenzel
5e06fa7385
Merge branch 'develop' into feature/integrations-api-1.1.0
# Conflicts:
#	pom.xml
2022-04-27 15:23:38 +02:00
Sebastian Stenzel
c3969f2f33
bumped integrations version 2022-04-27 15:19:54 +02:00
Sebastian Stenzel
0a8cc7ed1e
Merge branch 'develop' into release/1.6.9 2022-04-27 13:19:41 +02:00
Cryptobot
74f5be1605
New Crowdin updates (#2146)
[ci skip]
2022-04-27 13:19:03 +02:00
Sebastian Stenzel
3c376c4bf6
add -Dsun.java2d.metal=true, which fixes #2194 2022-04-27 13:18:25 +02:00
Armin Schrenk
fedb62d99a
Merge pull request #2175 from cryptomator/feature/binary-stylesheets
Prefer binary stylesheets
2022-04-27 13:06:18 +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
d6a55d3006
preparing 1.6.9 2022-04-26 18:14:40 +02:00
Armin Schrenk
d3d0cef2bb
bumping dependencies 2022-04-26 18:07:37 +02:00
Armin Schrenk
c514dc6235
fixes #2205 2022-04-26 17:58:37 +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
Armin Schrenk
835a5592fc
use pwsh for license generation to circumvent slash problem in url 2022-04-22 17:18:28 +02:00
Armin Schrenk
c429de6a66
third slash's the charm 2022-04-22 16:52:49 +02:00
Armin Schrenk
afe7737129
wrong usage of github workspace var 2022-04-22 16:25:00 +02:00
Armin Schrenk
94b3ea37d6
use absolute path in workflow 2022-04-22 16:19:09 +02:00
Tobias Hagemann
4d7e16d58e
updated license templates 2022-04-22 12:34:25 +02:00