mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-29 05:42:39 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,449 Commits 32 Branches 214 Tags
872680a7378e43f6094bfbe8d439d6ffcf63b4cc
Commit Graph

1449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
872680a737 updated dependencies, removed commons-io 2019-10-31 00:54:37 +01:00
Sebastian Stenzel
0ba12f6301 bumped version to 1.4.17 2019-10-31 00:54:09 +01:00
Sebastian Stenzel
7636d6874b Merge branch 'release/1.4.16' 1.4.16 2019-09-18 22:08:26 +02:00
Sebastian Stenzel
66c098c746 Preparing 1.4.16 2019-09-18 22:02:57 +02:00
Sebastian Stenzel
7534bb3c7e fixes #955 2019-09-18 22:01:16 +02:00
Sebastian Stenzel
ee57cd7d3b don't mark blocked issues as stale 
[ci skip]
 2019-08-27 10:32:31 +02:00
Sebastian Stenzel
59cd3defce Merge branch 'master' into develop 2019-08-18 15:22:28 +02:00
Sebastian Stenzel
f8d28ba30a Merge branch 'release/1.4.15' 1.4.15 2019-08-18 15:21:53 +02:00
Sebastian Stenzel
f1b96b29a7 Preparing 1.4.15 2019-08-18 14:47:45 +02:00
Sebastian Stenzel
6670e37050 Updated CryptoFS (which now adds a version suffix to masterkey backup files) 2019-08-18 14:46:46 +02:00
Sebastian Stenzel
2d6254b427 fixes #943 2019-08-17 11:16:12 +02:00
Sebastian Stenzel
c287294890 catch unchecked exceptions when checking whether linux keychain is accessible 
fixes #950, fixes #952, fixes #954
 2019-08-17 10:43:33 +02:00
Sebastian Stenzel
7de8e180dc Merge branch 'master' into develop 2019-08-12 16:44:35 +02:00
Sebastian Stenzel
7fee6ad52f Merge branch 'release/1.4.14' 1.4.14 2019-08-12 16:43:47 +02:00
Sebastian Stenzel
157e459a2e Preparing 1.4.14 2019-08-12 16:39:46 +02:00
Sebastian Stenzel
4f76295438 made class package-private 
[ci skip]
 2019-08-12 16:23:55 +02:00
Sebastian Stenzel
d4c14ffb74 Added checked exception to keychain api and reworked the way we attempt to access the gnome keyring. 
(references #947)
 2019-08-12 16:08:20 +02:00
Sebastian Stenzel
54c5f9b041 Merge branch 'master' into develop 
# Conflicts:
#	main/buildkit/pom.xml
#	main/commons/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/ui/pom.xml
 2019-08-02 16:36:41 +02:00
Sebastian Stenzel
3da45dc884 Merge branch 'hotfix/1.4.13' 1.4.13 2019-08-02 16:35:28 +02:00
Sebastian Stenzel
afb2b5e383 Updated dokany-nio-adapter to version 1.1.10 
fixes #884
 2019-08-02 16:03:53 +02:00
Sebastian Stenzel
8f9e117169 Merge branch 'master' into develop 2019-07-24 10:12:49 +02:00
Sebastian Stenzel
14766b89ab Merge branch 'release/1.4.12' 1.4.12 2019-07-24 10:12:07 +02:00
Tobias Hagemann
bf0e984e6c added links to some images [ci skip] 2019-07-17 14:16:25 +02:00
Tobias Hagemann
b33dd62dc5 updated sponsors [ci skip] 2019-07-17 14:12:56 +02:00
Sebastian Stenzel
53cc93a2b4 don't attempt to access linux keychain on non-linux systems, even if classes are present (i.e. when starting from IDE) 
[ci skip]
 2019-07-10 15:15:37 +02:00
Sebastian Stenzel
f16c887911 Updated CryptoFS 1.4.12-rc2 2019-07-10 12:48:24 +02:00
Sebastian Stenzel
dc889b8810 fixes #919 2019-07-09 17:04:05 +02:00
Sebastian Stenzel
903d8187e9 Preparing 1.4.12 1.4.12-rc1 2019-07-04 15:59:16 +02:00
Tobias Hagemann
7fedcafa9e Updated localizations 2019-07-04 15:48:42 +02:00
infeo
15dcf10ad7 fixing error where wrong mount flags are displayed (app started with webDAV and then switched to Fuse/Dokany) 2019-07-04 15:20:14 +02:00
infeo
1a99ae3e44 deactivating mout flags in the ui when WebDAV is used 2019-07-04 14:31:16 +02:00
infeo
82ff5ddabe due to change in type of winDriveLetters (from Character to Path) need addtional adjustment 2019-07-04 14:07:21 +02:00
infeo
67c29603da removing white spaces before and after additional dokany mount options 2019-07-04 14:04:19 +02:00
infeo
20e7186256 correcting wrong mount option 2019-07-04 14:03:14 +02:00
infeo
66d7621bc9 Merge branch 'bugfix/872-vaultLetterChangesAutomatically' into develop 2019-07-04 13:41:20 +02:00
infeo
5e46236cb2 formatting 2019-07-04 13:37:39 +02:00
infeo
ffb6cc354b fix for more consistent ui 2019-07-04 13:37:27 +02:00
infeo
23da229d81 spelling error 2019-07-04 13:06:38 +02:00
infeo
fe7e9d84ca fixing labels and gui element positions 2019-07-04 12:03:54 +02:00
infeo
ea1edb2320 Merge branch 'develop' into bugfix/872-vaultLetterChangesAutomatically 2019-07-04 11:38:37 +02:00
infeo
688726b98d Merge develop into /bugfix/872-vaultLetterChange 2019-07-04 11:22:08 +02:00
Sebastian Stenzel
e108bdbdb4 Update stale.yml 2019-07-03 18:57:30 +02:00
Sebastian Stenzel
b71c6a9d9f Merge branch 'feature/802-custom-mount-flags' into develop 
fixes #802
 2019-07-03 16:08:38 +02:00
Sebastian Stenzel
5d0e153155 no longer using snapshot 2019-07-03 15:46:56 +02:00
Sebastian Stenzel
0e40e785d5 Merge branch 'develop' into feature/802-custom-mount-flags 
[ci skip]
 2019-07-02 16:49:20 +02:00
Sebastian Stenzel
5b2bd86e32 Added paragraph about running Cryptomator using the .jar files within the buildkit. 
This fixes #917
[ci skip]
 2019-07-02 16:48:51 +02:00
Sebastian Stenzel
8f1fd24746 fixes #843 2019-07-02 16:41:44 +02:00
Sebastian Stenzel
f974876bf2 Merge branch 'feature/422-save-pw-linux' into develop 
fixes #422
 2019-07-02 16:12:45 +02:00
Sebastian Stenzel
7fcaded720 minor amendment to #905 
[ci skip]
 2019-07-02 16:09:48 +02:00
Sebastian Stenzel
c66519a2d0 Merge pull request #905 from purejava/secret-service-simple 
Fixes #422
 2019-07-02 16:06:06 +02:00