mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 01:26: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
Sebastian Stenzel
7d9aab46a8 fix broken path during mimetype installation 2022-02-24 16:27:28 +01:00
Sebastian Stenzel
69ff0e44f5 fix build 2022-02-24 12:00:02 +01:00
Sebastian Stenzel
ec1c255bb4 update appstream metadata 2022-02-24 10:56:36 +01:00
Sebastian Stenzel
43e936d117 rename mimetype file 2022-02-24 10:56:23 +01:00
Sebastian Stenzel
90da61e495 adjust ppa build to use "common" resources 2022-02-24 10:41:40 +01:00
Sebastian Stenzel
d38c19cffc adjust appimage build to use "common" resources 2022-02-24 10:38:32 +01:00
Sebastian Stenzel
0556bcd576 move metadata to "common" dir 2022-02-24 10:26:37 +01:00
Armin Schrenk
771e3ab6f3 remove unused ui elements from theme bundle 2022-02-24 09:53:26 +01:00
Armin Schrenk
7cfcfda66f Apply suggestions from code review 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2022-02-24 09:46:05 +01:00
Armin Schrenk
8090f95495 integrate windows installation bundle creation into gh action "release" 2022-02-23 22:30:22 +01:00
Armin Schrenk
7172462b4b Create installation bundle with winfsp: 
* via wix burn engine
* licenses generated on the fly
* customized theme
* local only
 2022-02-23 22:27:41 +01:00
Sebastian Stenzel
9f7442c1c0 read clientId from vault config 2022-02-23 12:49:39 +01:00
Tobias Hagemann
64845f0ffa Merge branch 'hotfix/1.6.6' 1.6.6 2022-02-21 14:45:19 +01:00
Tobias Hagemann
ee68f9d47b preparing 1.6.6 2022-02-21 14:45:01 +01:00
Tobias Hagemann
65bb6773cb Merge branch 'hotfix/1.6.6' 2022-02-21 14:25:05 +01:00
Tobias Hagemann
4bd4cd671b removed unnecessary entitlement in mac build 
(cherry picked from commit 3e8690ca11)
 2022-02-21 14:24:04 +01:00
Sebastian Stenzel
64abbc8205 Merge branch 'develop' into feature/hub 
# Conflicts:
#	.github/workflows/release.yml
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
 2022-02-18 09:38:25 +01:00
Sebastian Stenzel
165f190004 read device registration url from vault config 2022-02-18 09:13:33 +01:00
JaniruTEC
12a21bbb71 Added "--version" (short: "-v") 2022-02-17 02:39:48 +01:00
JaniruTEC
da2d647361 Merge pull request #2013 from cryptomator/feature/1888-existing-drive-letter-error 
Added error message if user tries to mount to occupied drive
 2022-01-30 01:38:16 +01:00
JaniruTEC
1641a06d65 Renamed NO_PARENT_NO_MOUNT_POINT to UNUSED_ROOT_DIR in MountPointRequirement 2022-01-30 01:35:02 +01:00
Sebastian Stenzel
d6ccb41027 add modules required for JFR 2022-01-26 19:47:51 +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
Sebastian Stenzel
e1a72c41a5 remove unused imports 2022-01-19 20:01:48 +01:00
Sebastian Stenzel
4d4098e0e0 cleanup 2022-01-19 19:49:33 +01:00
Sebastian Stenzel
d52e59d7a4 dedup by setting title when setting the scene 2022-01-19 19:08:54 +01:00
Sebastian Stenzel
9440fb186f Merge branch 'develop' into feature/simplified-workflow-results, 
solving conflict with 5509033

# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java
 2022-01-19 17:35:04 +01:00
Sebastian Stenzel
9856792921 replaced UserInteractionLock with CompletableFuture in LockWorkflow 2022-01-19 17:21:32 +01:00
JaniruTEC
080ddbbb01 Applied changes from code review. 2022-01-18 02:25:25 +01:00
Tobias Hagemann
3e8690ca11 removed unnecessary entitlement in mac build 
[ci skip]
 2022-01-12 11:01:59 +01:00
httpjamesm
f1fdd7960c Update copyright years from 2021 to 2022 to reflect the new year (#2015) 2022-01-10 10:01:07 +01:00
JaniruTEC
b7902ad8fd Merge branch 'develop' into feature/1888-existing-drive-letter-error 2022-01-09 00:35:32 +01:00
Armin Schrenk
bf382d928f Update dokan.dll [ci skip] 2022-01-05 10:53:18 +01:00
Armin Schrenk
7486fa2167 update Third parties license file 2022-01-04 16:35:42 +01:00
Armin Schrenk
550903325d Add vault name in unlock window titles 2022-01-04 16:35:09 +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
Sebastian Stenzel
b142904cc3 Merge pull request #1980 from cryptomator/feature/hub-integrated-device-registration 
Register device from within client application
 2021-12-16 18:02:00 +01:00
Sebastian Stenzel
806ffe704c convert Dagger modules to interfaces 2021-12-16 17:09:25 +01:00
Sebastian Stenzel
6ca87d13f5 renamed class 2021-12-16 17:01:56 +01:00
Sebastian Stenzel
983a4d0b0f move masterkey selection to subcomponent 
and use CompletableFuture instead of UserInteractionLock + AtomicReference
 2021-12-16 17:00:49 +01:00
Sebastian Stenzel
e95853deac make test public, fixing InaccessibleObject error in maven build 2021-12-16 16:46:57 +01:00
Sebastian Stenzel
d72d9f533c Replace CharBuffer and char[] instances by destroyable Passphrase 2021-12-16 16:41:07 +01:00
Tobias Hagemann
6403991bad Update release.yml 
[ci skip]
 2021-12-16 14:03:15 +01:00
Sebastian Stenzel
85a5146d4b wipe pw before losing reference 
[ci skip]
 2021-12-16 13:59:10 +01:00
Sebastian Stenzel
0bece0f591 move passphrase entry to subcomponent 
and use CompletableFuture instead of UserInteractionLock + AtomicReference
 2021-12-16 13:56:59 +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
a05dcd2f14 Merge branch 'hotfix/1.6.5' 1.6.5 2021-12-16 13:32:21 +01:00
Armin Schrenk
9775eaa2a8 bump logback to close possible vulnerability 2021-12-16 13:31:38 +01:00
Sebastian Stenzel
abc0f952e0 closing the window will cancel implicitly 2021-12-15 17:32:11 +01:00
Sebastian Stenzel
e6f43d1f05 no need to run code in ui thread 2021-12-15 17:31:08 +01:00