mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-21 18:16:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,420 Commits 29 Branches 213 Tags
d52e59d7a44090944e182bbd35ad16fcb01a76f4
Commit Graph

3420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Sebastian Stenzel
0fd6e5bbb0 fixed code smells 2021-12-03 12:17:07 +01:00
Sebastian Stenzel
f277d4d21b fix resource leak 2021-12-03 12:10:40 +01:00
Sebastian Stenzel
085304ec04 set up SonarCloud 2021-12-02 17:16:01 +01:00
Armin Schrenk
335a91d24a reset to snapshot version 
[ci skip]
 2021-12-02 12:34:09 +01:00
Armin Schrenk
e0a3b7a9df Merge branch 'release/1.6.4' 1.6.4 2021-12-02 12:24:47 +01:00
Armin Schrenk
c6a1690753 Merge tag '1.6.4' into develop 
1.6.4
 2021-12-02 12:24:47 +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
ae6766fa79 Merge pull request #1823 from purejava/feature/displayName 
Pass the name of the vault on storing and changing a passphrase
 2021-12-02 09:00:03 +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
Cryptobot
61d84a0da7 New Crowdin updates (#1894) 
* New translations strings.properties
[ci skip]
 2021-12-02 08:45:23 +01:00
Sebastian Stenzel
799b2c91bf Merge branch 'feature/patch-webdav' into develop 
# Conflicts:
#	dist/win/contrib/patchWebDAV.ps1
#	dist/win/resources/main.wxs
 2021-12-01 14:01:02 +01:00
Armin Schrenk
eee672f9ee closes #1932, closes #1931 2021-12-01 13:53:51 +01:00
Sebastian Stenzel
9f4a7c8cce renamed scripts 2021-12-01 12:35:01 +01:00
Armin Schrenk
b9bbbc1f86 Bump javafx 2021-11-30 17:02:37 +01:00
Armin Schrenk
13e9775458 Closes #1918 2021-11-29 17:33:11 +01:00
Armin Schrenk
e9e5df6310 Bump dependencies: 
* cryptofs
* gson
* logback

Closes #1825
 2021-11-29 17:31:27 +01:00
Sebastian Stenzel
2808d777e0 Add cryptomator-vault alias to etc/hosts during (re)install (#1914) 
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2021-11-29 16:37:23 +01:00
Sebastian Stenzel
9b8661fe3c use setup-java@v2 in release action 2021-11-24 16:22:09 +01:00
Martin Beyer
63b40091ea rename supporterCert WhiteSpace and VaultNameLength methods 2021-11-18 12:06:50 +01:00
Sebastian Stenzel
0c47af2f15 Merge pull request #1935 from cryptomator/feature/lock-retry-loop 
Handle exception when force-locking
 2021-11-17 16:00:41 +01:00
Sebastian Stenzel
5a735191a4 adjust heading 
(as it applies to both graceful and forced lock attempts)
 2021-11-17 14:05:42 +01:00
Sebastian Stenzel
21d342d117 Add non-forced retry lock button 2021-11-17 14:03:04 +01:00
Sebastian Stenzel
1b43bf395f apply same error handling to "force lock" as well 2021-11-17 13:45:43 +01:00
Sebastian Stenzel
71a575e079 add build scripts for windows 
[ci skip]
 2021-11-10 16:08:11 +01:00
Sebastian Stenzel
c5b6d8f81f target Ubuntu Bionic in PPA release (#1909) 2021-11-10 12:20:52 +01:00
Tobias Hagemann
0c6ecef92b Update README.md 
[ci skip]
 2021-11-10 08:51:50 +01:00