Armin Schrenk
72c8ca3368
preparing 1.6.12
2022-07-27 11:55:24 +02:00
Armin Schrenk
546da7d11f
preparing 1.6.11
2022-07-26 12:39:45 +02:00
Armin Schrenk
8662abae5a
Merge branch 'feature/hub' into develop
...
# Conflicts:
# .idea/runConfigurations/Cryptomator_Windows.xml
# .idea/runConfigurations/Cryptomator_Windows_Dev.xml
# dist/win/build.ps1
# src/main/java/org/cryptomator/common/Environment.java
2022-07-26 12:29:33 +02:00
Armin Schrenk
422077ac08
adjust pom
2022-07-20 17:01:29 +02:00
Armin Schrenk
d814c1cfca
Update integrations-win lib ( #2331 )
...
* update to integrations-win 1.1.2
* refactor environment class to reduce maintenance
* fix test
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com >
2022-07-11 15:59:54 +02:00
Sebastian Stenzel
2a91403f2f
bumped webdav-nio-adapter to version 1.2.8, containing vulnerability fixes in jetty
2022-07-11 10:09:22 +02:00
Sebastian Stenzel
f16a30ef29
Merge branch 'develop' into feature/hub
...
# Conflicts:
# pom.xml
2022-07-05 13:28:41 +02:00
Sebastian Stenzel
82db3b59fb
bump jwt dependency
2022-07-05 13:22:43 +02:00
Armin Schrenk
381c1cd8d3
Bump tinyoauth2 dependecy and adjust to new api
2022-07-04 17:15:00 +02:00
Armin Schrenk
d6f489ea98
bump dependencies
2022-06-22 12:36:00 +02:00
Armin Schrenk
45f038bae2
Merge branch 'develop' into feature/hub
...
# Conflicts:
# dist/mac/dmg/build.sh
# dist/win/build.ps1
# pom.xml
2022-06-22 09:55:02 +02:00
Tobias Hagemann
78bb996072
updated integrations-mac dependency
2022-05-13 13:42:40 +02:00
Armin Schrenk
822963e1a9
bump cryptofs
...
Fixes #2238
2022-05-13 13:17:11 +02:00
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
d4b3eff42f
restored success/error redirects
2022-04-28 12:59:27 +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
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
Sebastian Stenzel
9d4f9c12b9
outsourced authorization flow to https://github.com/coffeelibs/tiny-oauth2-client
2022-04-25 16:28:54 +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
f3bfe7b64c
Merge branch 'develop' into feature/hub
...
# Conflicts:
# .github/workflows/release.yml
# .idea/runConfigurations/Cryptomator_Linux.xml
# .idea/runConfigurations/Cryptomator_Linux_Dev.xml
# .idea/runConfigurations/Cryptomator_Windows.xml
# .idea/runConfigurations/Cryptomator_Windows_Dev.xml
# .idea/runConfigurations/Cryptomator_macOS.xml
# .idea/runConfigurations/Cryptomator_macOS_Dev.xml
# pom.xml
# src/main/java/module-info.java
# src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java
# src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java
# src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java
# src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java
# src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/SelectMasterkeyFileController.java
# src/main/resources/license/THIRD-PARTY.txt
2022-04-08 20:27:02 +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
