mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-29 08:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,192 Commits 36 Branches 214 Tags
08d741ecf516666f0abb98e77ce122a80e33caf1
Commit Graph

173 Commits

Author SHA1 Message Date
Armin Schrenk
24d472ed8b Merge branch 'develop' into feature/mount-provider 
# Conflicts:
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
 2023-01-11 16:01:27 +01:00
Armin Schrenk
523e5d7904 bump webdav- and dokany-adapter 2023-01-11 15:59:17 +01:00
Tobias Hagemann
304064d9ab updated dependency-check version 2023-01-09 11:59:51 +01:00
Armin Schrenk
fd5aeaf90a Merge branch 'develop' into feature/mount-setting-per-vault 2023-01-02 13:47:30 +01:00
Armin Schrenk
0b0870e313 Merge pull request #2575 from VsevolodGolovanov/issue_2557_unlocked_status_indicator_in_tray_icon 
Unlocked status indicator in tray icon 

Closes #2557
 2022-12-30 11:40:51 +01:00
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
Vsevolod Golovanov
5a99c7bb61 Unlocked status indicator in tray icon #2557 
Now tracking unlockedness and updating the icon accordingly.
 2022-12-14 21:18:37 +04:00
Armin Schrenk
ba66d4bfce bump fuse-nio-adapter 2022-12-07 17:39:27 +01:00
Armin Schrenk
c45a00377d Merge branch 'develop' into feature/mount-provider 
# Conflicts:
#	.github/workflows/appimage.yml
#	.github/workflows/mac-dmg.yml
#	.github/workflows/win-exe.yml
#	pom.xml
#	src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
#	src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
 2022-12-07 17:01:56 +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
Armin Schrenk
a70d8e1567 update nonModularGroupIds 2022-11-17 09:50:39 +01:00
Armin Schrenk
96b7a8df3f bump dokany-nio-adapter 2022-11-17 09:24:51 +01:00
Edward Chow
d8ed9f854a update pom.xml for integrations-api 1.2.0-beta1 2022-11-13 11:42:41 +11:00
Armin Schrenk
3c5502955a bump version of dokany-nio-adapter 2022-11-11 15:20:13 +01:00
Sebastian Stenzel
4029f86a0d reveal OR copy mount point depending on chosen mounter 2022-11-10 14:11:06 +01:00
Sebastian Stenzel
6dac00625c updated mount API 2022-11-09 15:33:20 +01:00
Armin Schrenk
0f84d0c990 adapt to new APIs 2022-11-07 14:49:56 +01: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