mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-14 08:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,130 Commits 36 Branches 214 Tags
8009205da7054a4e4dcd52e0ed7969a07fe2da39
Commit Graph

159 Commits

Author SHA1 Message Date
Armin Schrenk
8009205da7 Merge branch 'main' into develop 
# Conflicts:
#	pom.xml
 2022-12-14 20:07:24 +01:00
Armin Schrenk
8e902877a3 Update dependency-check plugin and exclude false positive 
(cherry picked from commit ebcd0adf78)
 2022-12-14 20:06:23 +01:00
Armin Schrenk
975baf594c Fixes #2576 2022-12-14 19:58:22 +01:00
Armin Schrenk
ebcd0adf78 Update dependency-check plugin and exclude false positive 2022-12-07 14:17:42 +01:00
Armin Schrenk
4ff8bbaa62 Merge branch 'develop' into release/1.6.16 2022-12-06 15:44:18 +01:00
Armin Schrenk
1b9480293a Bump cryptofs 2022-12-06 15:43:25 +01:00
Armin Schrenk
4bd99d2b66 preparing 1.6.16 2022-12-06 15:24:52 +01:00
Armin Schrenk
512500aaef bump cryptofs version 2022-12-06 11:03:29 +01:00
Armin Schrenk
32399c4a09 Merge pull request #2546 from cryptomator/feature/javafx-jmods 
Use OpenJFX jmods in jlink
 2022-12-05 23:18:52 +01:00
Armin Schrenk
3016d35c9b closes #2488 2022-12-02 11:22:50 +01:00
Sebastian Stenzel
33ebc17619 Merge branch 'develop' into fix/2383-tray-icon-refresh 2022-11-30 11:46:36 +01:00
Sebastian Stenzel
99bc4dbdc5 use openjfx jmods instead of jars 2022-11-30 11:16:38 +01:00
Edward Chow
d8ed9f854a update pom.xml for integrations-api 1.2.0-beta1 2022-11-13 11:42:41 +11:00
Edward Chow
dc310c009f rename to onBeforeOpenMenu and init local reference in showTrayIcon() 2022-11-01 22:37:11 +11:00
Sebastian Stenzel
7091839f08 Merge pull request #2505 from cryptomator/feature/javafx-19 2022-10-28 22:09:29 +02:00
Sebastian Stenzel
70e5f53009 Merge branch 'develop' into feature/jdk19 2022-10-27 18:13:42 +02:00
Sebastian Stenzel
c79cfe1c9d Merge branch 'develop' into feature/javafx-19 
# Conflicts:
#	pom.xml
 2022-10-26 11:43:07 +02:00
Sebastian Stenzel
d619a0cbf4 bump jwt version 2022-10-26 11:40:09 +02:00
Edward Chow
f852ae0392 remove AWT code and relocate to TrayMenuController 2022-10-16 22:26:30 +11:00
Sebastian Stenzel
69641ed3b6 Merge branch 'develop' into feature/jdk19 
[ci skip]
 2022-10-14 13:55:15 +02:00
Sebastian Stenzel
2399e29d75 update logback 2022-10-12 13:42:11 +02:00
Sebastian Stenzel
76e7a0a7b8 bump OpenJFX to version 19 
replaced EasyBind with `ObservableValue.map()` where possible
 2022-10-10 10:24:42 +02:00
Sebastian Stenzel
c805a820a4 Merge branch 'main' into develop 
[ci skip]
 2022-10-06 17:42:00 +02:00
Sebastian Stenzel
b6e381f0bf apply cryptofs hotfix 2022-10-06 17:37:03 +02:00
Sebastian Stenzel
aef3f4c6e2 prepare 1.6.15 2022-10-06 16:49:12 +02:00
Sebastian Stenzel
7bc5a336e4 dependency bump 2022-10-06 16:48:12 +02:00
Sebastian Stenzel
91f49c5642 update cryptolib + cryptofs 
fixes #2451
 2022-10-06 15:20:21 +02:00
Sebastian Stenzel
d19e77432e build with jdk 19 2022-09-21 09:28:37 +02:00
Sebastian Stenzel
16c0431f6f use release versions of slf4j + logback 2022-08-31 10:52:53 +02:00
Sebastian Stenzel
46dbe15e4a update dependencies 2022-08-11 17:34:34 +02:00
Sebastian Stenzel
bf83df3cd3 Merge branch 'main' into develop 
# Conflicts:
#	pom.xml

[ci skip]
 2022-08-05 14:31:59 +02:00
Sebastian Stenzel
bf84598131 set version to 1.6.13 2022-08-05 14:31:10 +02:00
Sebastian Stenzel
943be4557f fixes #2374 2022-08-05 14:28:47 +02:00
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