mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-18 08:36:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,138 Commits 29 Branches 213 Tags
a30db34c1994e94de85f8e8fc59166add04424d3
Commit Graph

5138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan-Peter Klein
63bf0315c7 created global mountService 2023-12-05 16:21:12 +01:00
Armin Schrenk
8b543c48ee [ci skip] Merge branch 'main' into develop 2023-12-05 11:11:31 +01:00
Armin Schrenk
087a5326df Merge branch 'release/1.11.1' 1.11.1 2023-12-05 11:09:36 +01:00
Armin Schrenk
a4545352d8 finalize 1.11.1 2023-12-05 11:09:09 +01:00
dependabot[bot]
a07dea7ca8 Bump the github-actions group with 2 updates (#3235) 2023-12-05 08:39:49 +00:00
Jan-Peter Klein
c369487e8e Merge branch 'develop' into feature/vault-volume-type 2023-12-01 09:13:38 +01:00
Jan-Peter Klein
98590ecec5 refactoring 2023-12-01 09:11:43 +01:00
Armin Schrenk
316f3975ed add missing import 2023-11-30 18:24:52 +01:00
Armin Schrenk
71bf7e0913 Simplify handling of window hiding events 2023-11-30 18:22:07 +01:00
dependabot[bot]
c7839e2c46 Bump the java-production-dependencies group with 2 updates (#3234) 2023-11-30 14:26:07 +00:00
Armin Schrenk
89b8bc4148 adjust ui and add localization 2023-11-30 11:44:41 +01:00
Armin Schrenk
43ad1c05c0 cancel background task, if window is closed 2023-11-30 11:18:33 +01:00
Armin Schrenk
1343099be6 [ci skip] correct dependabot config 2023-11-30 10:03:29 +01:00
Armin Schrenk
b895ac69fb fixes #3233 2023-11-29 18:45:52 +01:00
dependabot[bot]
7d281e2878 Bump the javafx group with 5 updates (#3229) 2023-11-29 15:08:31 +00:00
Armin Schrenk
688450bf5a prepare 1.11.1 1.11.1-beta1 2023-11-28 13:38:05 +01:00
Cryptobot
e994133177 New Crowdin updates (#3191) 
New translations strings.properties

Bulgarian; Chinese Simplified; Chinese Traditional; Dutch; Filipino; French; Greek; Hungarian; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Spanish; Swedish; Turkish; 

[ci skip]
 2023-11-28 13:32:08 +01:00
dependabot[bot]
68713ef9a7 Merge pull request #3228 from cryptomator/dependabot/maven/maven-build-plugins-907533b1a4 2023-11-28 12:28:35 +00:00
Armin Schrenk
dbacbc8874 do not exectue dependency-check on CI (due to missing NVD API key) 2023-11-28 13:25:47 +01:00
dependabot[bot]
8382299a05 Bump the maven-build-plugins group with 4 updates 
Bumps the maven-build-plugins group with 4 updates: [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin), [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire), [org.codehaus.mojo:license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) and [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck).


Updates `org.apache.maven.plugins:maven-dependency-plugin` from 3.6.0 to 3.6.1
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1)

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.1.2 to 3.2.2
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.2...surefire-3.2.2)

Updates `org.codehaus.mojo:license-maven-plugin` from 2.2.0 to 2.3.0
- [Release notes](https://github.com/mojohaus/license-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/license-maven-plugin/compare/2.2.0...2.3.0)

Updates `org.owasp:dependency-check-maven` from 8.4.0 to 9.0.1
- [Release notes](https://github.com/jeremylong/DependencyCheck/releases)
- [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jeremylong/DependencyCheck/compare/v8.4.0...v9.0.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: maven-build-plugins
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven-build-plugins
- dependency-name: org.codehaus.mojo:license-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven-build-plugins
- dependency-name: org.owasp:dependency-check-maven
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: maven-build-plugins
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-28 12:20:39 +00:00
dependabot[bot]
93b09cf449 Bump the java-production-dependencies group with 6 updates (#3230) 2023-11-28 12:19:58 +00:00
dependabot[bot]
dac3311b81 Bump the java-test-dependencies group with 2 updates (#3227) 2023-11-28 12:05:42 +00:00
Armin Schrenk
5b1ca7a533 update dependabot config 2023-11-28 12:59:39 +01:00
Armin Schrenk
e940c29110 Closes #3226 2023-11-28 12:44:42 +01:00
Jan-Peter Klein
6a704ca0ad Merge branch 'develop' into feature/vault-volume-type 2023-11-27 16:24:35 +01:00
Jan-Peter Klein
38c102a64b refactored code by removing unnecessary observables 2023-11-27 12:46:29 +01:00
Armin Schrenk
b632c84bb6 more renaming 2023-11-24 11:23:22 +01:00
Armin Schrenk
6bb5ed1d73 fixes #3207 2023-11-24 11:19:44 +01:00
Jan-Peter Klein
1052e4c3d2 fix gui issues in vault mount settings 2023-11-23 10:55:17 +01:00
Armin Schrenk
44f776050f Apply suggestions from code review 
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
 2023-11-22 21:36:15 +01:00
Armin Schrenk
baa29dbd73 remove unused translation key 2023-11-17 16:33:53 +01:00
Armin Schrenk
1caf391936 use correct word for button label 2023-11-17 16:24:23 +01:00
Armin Schrenk
82caf76e12 clean up 2023-11-17 15:51:20 +01:00
Armin Schrenk
de27bbf96e always cancle unlock result when closing the unlock window 2023-11-17 15:50:39 +01:00
Armin Schrenk
1199ef40dd on 409 repsonse of registerDevice-request, show setupFailed with adjusted message 2023-11-17 15:47:08 +01:00
Jan-Peter Klein
e7e88f13e3 improved code quality 2023-11-17 14:51:13 +01:00
Armin Schrenk
41c22b7840 Rename leftovers 2023-11-17 13:30:40 +01:00
Armin Schrenk
19cc4e8a37 Merge pull request #3194 from AntoineJT/feature/3155-toggle-vault-status-on-double-click 
Feature: Double click on a vault in the list to unlock it
 2023-11-15 16:51:44 +01:00
Jan-Peter Klein
7bc1d52bf8 set deprecated since of settingsjson port to 1.12.0, changed button text and added tooltip to 'show vault options' button 2023-11-12 13:49:47 +01:00
Antoine James Tournepiche
fd84ff09e1 No longer lock vault on double click 
See https://github.com/cryptomator/cryptomator/pull/3194#issuecomment-1806106843
 2023-11-10 22:05:58 +01:00
Antoine James Tournepiche
3dce175f94 Improve naming, avoid shadowing 2023-11-10 17:42:19 +01:00
Antoine James Tournepiche
0aaa3263cf Improve feature #3155 implementation 2023-11-09 23:50:34 +01:00
Antoine James Tournepiche
c4dcbd8c44 Implement requested feature #3155 
Toggle selected vault lock status on double click on a vault item
in the vault list on the main window
 2023-11-09 23:42:22 +01:00
Jan-Peter Klein
ef9cdd8e92 Merge branch 'develop' into feature/vault-volume-type 
# Conflicts:
#	src/main/resources/i18n/strings.properties
 2023-11-08 11:45:03 +01:00
Armin Schrenk
09ced50590 [ci skip] reset to snapshot version 2023-11-08 11:28:21 +01:00
Armin Schrenk
b2ab1a30a5 Merge branch 'main' into develop 2023-11-08 11:26:49 +01:00
Armin Schrenk
9eff3916b3 Merge branch 'release/1.11.0' 1.11.0 2023-11-08 11:26:13 +01:00
Armin Schrenk
98472d1952 use correct release date 2023-11-08 11:25:45 +01:00
Armin Schrenk
1ceafb69a5 finalize 1.11.0 2023-11-08 11:22:27 +01:00
Armin Schrenk
f3f4b6576c Merge branch 'develop' into release/1.11.0 
# Conflicts:
#	src/main/resources/i18n/strings.properties
 2023-11-08 10:52:30 +01:00