Armin Schrenk
|
fb3d64c43f
|
update integrations-win dependency
|
2022-05-11 12:41:33 +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 |
|
Sebastian Stenzel
|
e9551a076d
|
Merge branch 'develop' into release/1.6.9
|
2022-04-27 15:30:59 +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 |
|
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 |
|
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
|
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
|
9f5c31e4e7
|
Move app specific license template to resources directory
|
2022-04-21 14:21:40 +02:00 |
|
Armin Schrenk
|
bcfba21900
|
Create third-party-license file in target directory, use plugin defaults to let it placed inside jar
|
2022-04-20 17:46:58 +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 |
|
Sebastian Stenzel
|
2b255ed101
|
Merge branch 'develop' into feature/integrations-api-1.1.0
# Conflicts:
# src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
# src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
|
2022-04-13 07:21:59 +02:00 |
|
Sebastian Stenzel
|
9ece1f66a1
|
bumped API to 1.1.0-rc1
|
2022-04-13 07:16:19 +02:00 |
|
Sebastian Stenzel
|
564370ec7a
|
compile .css into .bss file
|
2022-04-11 12:31:57 +02:00 |
|
Sebastian Stenzel
|
9ed7438f05
|
bump zxcvbn4j version, fixes #979
|
2022-04-05 08:00:05 +02:00 |
|
Sebastian Stenzel
|
d7da78fc07
|
adjust to latest API
|
2022-04-03 15:26:04 +02:00 |
|
Sebastian Stenzel
|
e93e31e745
|
Merge branch 'develop' into feature/integrations-api-1.1.0
# Conflicts:
# pom.xml
# src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
# src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
# src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
# src/main/resources/license/THIRD-PARTY.txt
|
2022-04-03 12:53:08 +02:00 |
|
Sebastian Stenzel
|
887e0332da
|
changed misleading comment
[ci skip]
|
2022-04-01 14:50:27 +02:00 |
|
Sebastian Stenzel
|
dc6b5774b8
|
Merge branch 'develop' into feature/javafx-launcher
# Conflicts:
# pom.xml
|
2022-03-31 08:55:49 +02:00 |
|
Armin Schrenk
|
338eb45e24
|
bump dependencies
|
2022-03-30 16:17:06 +02:00 |
|
Armin Schrenk
|
2de23f8fff
|
bump jwt lib to fix possible vulnerability
|
2022-03-30 15:56:22 +02:00 |
|
Sebastian Stenzel
|
e907360419
|
refactored launcher, deleted UiLauncherModule
component graph is now: Main → FxApplicationComponent → Tray, MainWindow, etc
|
2022-03-29 20:39:46 +02:00 |
|
Sebastian Stenzel
|
4abb41aebd
|
Merge branch 'develop' into feature/integrations-api-1.1.0
# Conflicts:
# src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
|
2022-03-23 11:02:48 +01:00 |
|
Sebastian Stenzel
|
c40ef2f0f2
|
bump webdav dependency, which fixes #1273
|
2022-03-23 10:42:58 +01:00 |
|
Sebastian Stenzel
|
8fa562aa60
|
bumped dependencies
|
2022-03-23 10:42:20 +01:00 |
|
snyk-bot
|
19d26de4ec
|
fix: pom.xml to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2421244
|
2022-03-21 14:06:43 +01:00 |
|
Armin Schrenk
|
f231c25dfc
|
Update maven plugin dependencies
|
2022-03-16 15:08:46 +01:00 |
|
Armin Schrenk
|
c29cc9ab85
|
supress false positive in dependency-check plugin
|
2022-03-16 15:08:09 +01:00 |
|
Sebastian Stenzel
|
a404740ceb
|
Updated to integrations-api 1.1.0-beta2
|
2022-03-07 17:35:48 +01:00 |
|
Sebastian Stenzel
|
ed1459a0f0
|
Update pom.xml
|
2022-03-01 08:49:47 +01:00 |
|
KarlKeu00
|
a9846744fe
|
Update JavaFX to 17.0.2 (#2031)
Updating JavaFX inside Maven to 17.0.2 to fix JDK-8275723. This is only relevant for development on a Mac with an M1 processor.
|
2022-01-21 13:16:06 +01:00 |
|
Armin Schrenk
|
2afd9f1c1d
|
Bump logback
hotfix 1.2.8 is superseded by 1.2.9 as stated in https://jira.qos.ch/browse/LOGBACK-1591?focusedCommentId=20920&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-20920
|
2021-12-17 14:52:18 +01:00 |
|
Armin Schrenk
|
196521bfd0
|
Merge tag '1.6.5' into develop
1.6.5
# Conflicts:
# pom.xml
|
2021-12-16 13:33:40 +01:00 |
|
Armin Schrenk
|
9775eaa2a8
|
bump logback to close possible vulnerability
|
2021-12-16 13:31:38 +01:00 |
|
Armin Schrenk
|
36f87b3643
|
closes #1961
|
2021-12-15 12:46:23 +01:00 |
|
Armin Schrenk
|
8ac7ba8f56
|
preparing hotfix 1.6.5
|
2021-12-15 12:45:52 +01:00 |
|
Armin Schrenk
|
335a91d24a
|
reset to snapshot version
[ci skip]
|
2021-12-02 12:34:09 +01:00 |
|
Armin Schrenk
|
4e3742c206
|
Merge branch 'develop' into release/1.6.4
|
2021-12-02 12:22:29 +01:00 |
|
Armin Schrenk
|
919257a99e
|
Bump dagger
|
2021-12-02 11:23:27 +01:00 |
|
Sebastian Stenzel
|
2c42a9573e
|
Merge branch 'develop' into feature/displayName
# Conflicts:
# pom.xml
|
2021-12-02 08:52:40 +01:00 |
|
Sebastian Stenzel
|
4baf05e684
|
prepare 1.6.4
|
2021-12-02 08:46:35 +01:00 |
|
Armin Schrenk
|
b9bbbc1f86
|
Bump javafx
|
2021-11-30 17:02:37 +01:00 |
|