Julian Raufelder
de78cd014d
Merge branch 'main' into develop
2023-08-11 16:44:23 +02:00
Julian Raufelder
9db53f73e2
Merge branch 'hotfix/1.9.4'
2023-08-11 16:07:37 +02:00
Julian Raufelder
e5f0aca477
Finalize 1.9.4
2023-08-11 15:54:50 +02:00
Julian Raufelder
261f2da105
Prepare 1.9.4
2023-08-11 15:53:26 +02:00
Julian Raufelder
ef4738f920
Use latest version of Java to avoid using an out of date version when building the release
...
See https://github.com/actions/setup-java/tree/main#check-latest for further information
2023-08-11 15:52:42 +02:00
Armin Schrenk
f23348eda2
Merge branch 'develop' into release/1.10.0
2023-08-09 22:56:05 +02:00
Armin Schrenk
6edfaf3eb6
fix windows installer ci script
2023-08-09 22:55:32 +02:00
Armin Schrenk
9d02035263
Merge branch 'develop' into release/1.10.0
2023-08-09 21:04:54 +02:00
Armin Schrenk
8bbcb86bfc
fix windows build script
2023-08-09 20:59:13 +02:00
Armin Schrenk
abdc8672f1
update org.openjdk:javafx from 20.0.1 to 20.0.2
2023-08-09 20:41:14 +02:00
Armin Schrenk
333c7457ca
bump org.cryptomator:cryptofs from 2.6.6 to 2.6.7
2023-08-09 20:23:51 +02:00
Cryptobot
9b9a354902
New Crowdin updates ( #3029 )
...
New translations strings.properties
Arabic; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese;
[ci skip]
2023-08-09 15:26:10 +02:00
Sebastian Stenzel
f48963a6d0
Merge branch 'develop' into feature/new-hub-keyloading
...
# Conflicts:
# src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
2023-08-09 15:26:03 +02:00
Sebastian Stenzel
83b2ff8ce8
fixes #3051
2023-08-09 15:20:32 +02:00
dependabot[bot]
b7f514e16b
Bump the all group with 2 updates ( #3066 )
...
Bumps the all group with 2 updates: [actions/checkout](https://github.com/actions/checkout ) and [SamKirkland/FTP-Deploy-Action](https://github.com/samkirkland/ftp-deploy-action ).
Updates `actions/checkout` from 2 to 3
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v2...v3 )
Updates `SamKirkland/FTP-Deploy-Action` from 4.3.0 to 4.3.4
- [Release notes](https://github.com/samkirkland/ftp-deploy-action/releases )
- [Commits](https://github.com/samkirkland/ftp-deploy-action/compare/4.3.0...v4.3.4 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
dependency-group: all
- dependency-name: SamKirkland/FTP-Deploy-Action
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: all
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-08-09 15:03:35 +02:00
Sebastian Stenzel
5c4c59fe18
add dependabot config
2023-08-09 13:19:23 +02:00
mindmonk
296ae20cc2
Merge pull request #3060 from cryptomator/feature/error-dialog-lookup-permission
...
Ask before looking up error code
2023-08-07 16:25:40 +02:00
Jan-Peter Klein
7af5e00d71
clean up imports
2023-08-07 15:11:10 +02:00
Jan-Peter Klein
deaf71b4ce
Merge branch 'develop' into feature/error-dialog-lookup-permission
2023-08-07 15:08:44 +02:00
Jan-Peter Klein
27f3d85ae2
renamed lookupDatabaseUserPermission to askedForLookupDatabasePermission
2023-08-07 15:08:25 +02:00
Jan-Peter Klein
f91a854b3e
removed more info hyperlink and fixed ui by moving isLoadingHttpResponse.set(true)
2023-08-07 14:56:01 +02:00
Armin Schrenk
be7b265a00
Merge branch 'main' into develop
...
# Conflicts:
# pom.xml
2023-08-07 10:27:13 +02:00
Armin Schrenk
34c0f1d13e
Merge branch 'hotfix/1.9.3'
2023-08-07 10:26:43 +02:00
Armin Schrenk
da21c7fa80
suppress false positive
...
cherry picked from 9bd5b45ea7
2023-08-07 10:25:42 +02:00
Armin Schrenk
9ae9473b95
finalize 1.9.3
2023-08-07 10:19:04 +02:00
Armin Schrenk
32a17407de
Add -NoProfile to windows build script to follow best practices
2023-08-07 10:15:25 +02:00
Tobias Hagemann
727c32ad50
Merge pull request from GHSA-62gx-54j7-mjh3
...
Add -NoProfile option to powershell scripts run during windows installer
2023-08-07 10:14:45 +02:00
Armin Schrenk
d939e91661
prepare 1.9.3
2023-08-07 10:04:08 +02:00
Armin Schrenk
151f2babd8
Add NoProfile option to powershell scripts run during windows instaler
...
Closes #GHSA-62gx-54j7-mjh3
2023-08-07 10:02:39 +02:00
Jan-Peter Klein
76340f31d1
undo changes in REPORT_BODY_TEMPLATE
2023-08-04 17:23:35 +02:00
Jan-Peter Klein
b2f2d3ac36
Merge branch 'develop' into feature/error-dialog-lookup-permission
2023-08-04 17:03:26 +02:00
Armin Schrenk
9bd5b45ea7
suppress false positive in dependecy-check (jackrabbit-webdav)
2023-08-04 17:01:19 +02:00
Jan-Peter Klein
a17b2029ec
moved isLoadingHttpResponse.set(true) into void loadHttpResponse
2023-08-04 16:51:28 +02:00
Jan-Peter Klein
4c819807de
implemented 'More Info...' hyperlink functionality
2023-08-04 16:12:01 +02:00
Jan-Peter Klein
175e05aae4
Merge branch 'develop' into feature/error-dialog-lookup-permission
2023-08-03 12:54:01 +02:00
Jan-Peter Klein
fa3e0efd12
init commit
...
added new string properties
added ui elements for user permission to look up error solutions in database
modified ErrorController for permission handling
2023-08-03 12:53:44 +02:00
Armin Schrenk
d08d992768
Bump integrations-win to 1.2.2
2023-08-02 09:44:31 +02:00
Armin Schrenk
7f0c92e2f0
Bump integrations-linux to 1.3.0-beta6
...
Fixes #3020
2023-08-02 09:44:18 +02:00
Armin Schrenk
f4ad7aa43d
References #3045
...
Use different encoding reading process output
2023-08-01 16:29:36 +02:00
Armin Schrenk
40611b4ebe
improve wording
2023-08-01 10:48:42 +02:00
Sebastian Stenzel
1f09a3fa3a
allow notarization on manually dispatched builds
2023-08-01 10:04:34 +02:00
Sebastian Stenzel
7d7b88829d
allow notarization on manually dispatched builds
2023-08-01 10:04:07 +02:00
Sebastian Stenzel
4078abeb33
Merge branch 'feature/fix-macOS-build' into release/1.10.0
2023-08-01 09:42:29 +02:00
Julian Raufelder
6f6c3936aa
Merge pull request #3039 from cryptomator/feature/change-error-codes-url
...
Change error codes URL
2023-07-29 10:04:50 +00:00
Julian Raufelder
6771963686
Merge pull request #3038 from cryptomator/feature/change-update-check-url
...
Change update check URL
2023-07-29 10:04:28 +00:00
Julian Raufelder
ab409152e3
Change error codes URL
2023-07-28 16:14:58 +02:00
Sebastian Stenzel
6ce34efb52
Merge branch 'develop' into feature/new-hub-keyloading
2023-07-28 15:23:00 +02:00
Julian Raufelder
f92cf9c9e0
Change update check URL
2023-07-27 15:49:38 +02:00
Armin Schrenk
8b9d5d136e
Merge pull request #3033 from cryptomator/feature/fix-macOS-build
...
CI: Use Temurin JVM+JFX Jmods from Gluon instead of Zulu JVM+FX
Fixes #3030
2023-07-26 19:53:48 +02:00
Armin Schrenk
3071cfbfb1
Merge pull request #2885 from purejava/libappindicator
...
appindicator support
Closes #1645
2023-07-26 14:25:55 +02:00
