mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-06-09 21:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,498 Commits 30 Branches 215 Tags
develop
Commit Graph

6498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ralph Plawetzki 5217546f73 Isolate SimpleCollection via an interface and avoid imports for it 
This is needed on other platforms than Linux to avoid class loading problems on runtime in case secret-service.jar is missing
 2019-06-29 15:31:22 +02:00
Ralph Plawetzki 63383866ea Add access functionality for Gnome login keyring 2019-06-29 15:28:26 +02:00
Sebastian Stenzel 0da567613d custom mount flag support for Dokany (#802) 
[ci skip]
 2019-06-25 11:32:53 +02:00
Sebastian Stenzel 5688289918 UI tweaks to unlock screen (to be tested under windows) 2019-06-24 14:47:58 +02:00
Sebastian Stenzel b15d410378 Re-layouted unlock UI and added textfield for custom mount flags (atm only supported for FUSE - see #802) 2019-06-18 16:39:56 +02:00
Sebastian Stenzel ed9adab9b4 store custom mount flags in settings.json as string instead of string array 2019-06-18 16:31:10 +02:00
Sebastian Stenzel 06abbf2dd1 custom mount flags default to empty flags 2019-06-18 15:00:54 +02:00
Sebastian Stenzel f909f384be improved error logging 2019-06-18 15:00:25 +02:00
Sebastian Stenzel 367281fccb overwrite settings atomically 2019-06-18 14:45:43 +02:00
Sebastian Stenzel f53f2d2ca4 allow to store custom mount flags in the vault settings (required for #802) 
[ci skip]
 2019-06-17 13:55:31 +02:00
Sebastian Stenzel af73dab795 Merge branch 'master' into develop 2019-06-11 12:58:44 +02:00
Sebastian Stenzel 569a2c86ba Merge branch 'release/1.4.11' 1.4.11 2019-06-11 12:57:36 +02:00
Sebastian Stenzel 37f9ec31a5 fixes #900 1.4.11-rc2 2019-06-06 16:41:50 +02:00
Tobias Hagemann 8db856855e Updated issue templates, code of conduct, and contributing [ci skip] 2019-05-24 14:51:48 +02:00
Tobias Hagemann c31212a73a Create SECURITY.md 2019-05-23 16:12:53 +02:00
Sebastian Stenzel bcbf53a606 Create FUNDING.yml 
[ci skip]
 2019-05-23 16:01:12 +02:00
Sebastian Stenzel e35c7a6991 Updated issue templates 
[ci skip]
 2019-05-23 12:50:40 +02:00
Sebastian Stenzel ff80b4c61d Preparing 1.4.11 1.4.11-rc1 2019-05-22 17:17:08 +02:00
Sebastian Stenzel 295400cb97 fixes #890, fixes #867 2019-05-22 17:13:57 +02:00
Tobias Hagemann e1a9a3d519 Added French (BE), French (CA), Indonesian, and Swedish localizations 2019-05-22 16:26:54 +02:00
Tobias Hagemann 393628bf70 Merge pull request #896 from purejava/fix-887 
Fixes https://github.com/cryptomator/cryptomator/issues/887
 2019-05-19 13:37:21 +02:00
Ralph Plawetzki 31dd78ee28 Fixes https://github.com/cryptomator/cryptomator/issues/887 
Set text in password field to null when they get swiped
 2019-05-18 13:27:29 +02:00
Tobias Hagemann f0f3b97a4f Annoying IDE [ci skip] 2019-05-09 16:29:25 +02:00
Tobias Hagemann e9f55da573 Merge branch 'master' into develop 2019-05-09 13:29:10 +02:00
Tobias Hagemann 272115d2f7 Merge branch 'release/1.4.10' 1.4.10 2019-05-09 13:19:09 +02:00
infeo 95ae0ac9fd fixes #867 2019-05-08 15:11:14 +02:00
Sebastian Stenzel c2e1f8d7f7 preparing 1.4.10 1.4.10-rc1 2019-05-07 13:21:54 +02:00
Sebastian Stenzel 8205e4dd5a fixes #880 
fixes #862
 2019-05-07 13:16:23 +02:00
Sebastian Stenzel e83aab9968 fixes #883 2019-05-07 12:37:43 +02:00
Sebastian Stenzel 19222475ec Updated README.md 
(due to confusions, see #682)
[ci skip]
 2019-05-07 11:33:06 +02:00
Tobias Hagemann a304b9a5c7 Merge branch 'master' into develop 2019-04-27 22:43:18 +02:00
Tobias Hagemann 0037c12326 Merge branch 'release/1.4.9' 1.4.9 2019-04-27 22:42:26 +02:00
Tobias Hagemann 5908249325 Preparing 1.4.9 2019-04-27 22:41:46 +02:00
Tobias Hagemann debdf92cfc Updated CryptoFS to 1.8.2, fixes #877 2019-04-27 22:37:48 +02:00
Tobias Hagemann 5944086510 Switching to Xenial for CI builds 2019-04-27 22:25:19 +02:00
Sebastian Stenzel a551663127 Merge branch 'master' into develop 2019-04-24 14:01:25 +02:00
Sebastian Stenzel 1cc0b0728d Merge branch 'release/1.4.8' 1.4.8 2019-04-24 14:00:50 +02:00
Tobias Hagemann 7e7d5e46d3 Updated localizations 2019-04-24 13:29:04 +02:00
Sebastian Stenzel 5625525b21 Preparing 1.4.8 2019-04-24 13:00:02 +02:00
Sebastian Stenzel b8fa226163 Updated dokany-nio-adapter to 1.1.7, required by #783 2019-04-24 12:58:29 +02:00
Unknown 2b44f0ee9f updated IDE config 
[ci skip]
 2019-04-24 12:49:35 +02:00
Sebastian Stenzel b1ea21809b Updated CryptoFS to 1.8.1, fixes #875 2019-04-24 11:05:00 +02:00
Tobias Hagemann 8def0b2060 Fixed localization 2019-04-12 16:09:38 +02:00
Tobias Hagemann 2f61964758 Updated localizations 2019-04-12 14:35:13 +02:00
Sebastian Stenzel 2668299131 Merge branch 'master' into develop 2019-04-12 13:33:35 +02:00
Sebastian Stenzel a7de849800 Merge branch 'release/1.4.7' 1.4.7 2019-04-12 13:33:00 +02:00
Sebastian Stenzel c66a8d0cfe Preparing 1.4.7 2019-04-12 13:24:27 +02:00
Sebastian Stenzel efa7f78ffd Added IDE run configuration 
[ci skip]
 2019-04-12 13:20:42 +02:00
Sebastian Stenzel 57c858351d Further dependency updates 2019-04-12 12:42:12 +02:00
Sebastian Stenzel c3e48934b2 fixes #862, fixes #853 2019-04-12 12:40:27 +02:00