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
84d6f11be2 Merge branch 'develop' into feature/fuse-integration 
# Conflicts:
#	main/commons/pom.xml
#	main/pom.xml
 2018-03-06 11:34:41 +01:00
Sebastian Stenzel
b3cf7eee16 updated fuse-adapter version 2018-03-06 11:26:53 +01:00
Sebastian Stenzel
9e5e14e462 Merge commit 'bfd8918e6ab3d0a01e9326eb35ce53203876b746' into develop 2018-03-02 12:46:05 +01:00
infeo
b165f41c6b fixed test 2018-03-01 23:31:48 +01:00
infeo
41358e6715 fixing issue using an individual mountPath, renaming mountPath-Property, fixing gui issues with mountPath, 2018-03-01 23:27:01 +01:00
infeo
c8387c7e3c adding "_ID-" suffix to mount name 2018-03-01 15:27:26 +01:00
infeo
8ace293701 fixing issue in the default vault path (missing leading '/') 2018-03-01 15:24:43 +01:00
infeo
f5a08f05c1 fixing visibillity bug in settings of webdav properties shown when fuse is selected 2018-03-01 14:46:37 +01:00
infeo
9707d951d6 fixing a renaming issue 2018-03-01 14:39:12 +01:00
infeo
242b1e92a3 renaming NioAdapter-Interface to Volume to prevent confusing to FUSE-project 2018-03-01 14:35:03 +01:00
infeo
3bc7df9e83 moving the nioAdapterImpl to the commons package 2018-03-01 14:31:49 +01:00
infeo
f774829fb1 Pushing FuseEnvironment to other project, using fuseMount now in FuseNioAdapter 2018-02-27 15:38:25 +01:00
Sebastian Stenzel
bfd8918e6a updated pom.xml files 2018-02-26 18:33:51 +01:00
Sebastian Stenzel
3989316269 replaced org.apache.httpcomponents:httpclient by jdk.incubator.httpclient (will become official standard in jdk10) 2018-02-23 18:21:38 +01:00
infeo
d0d83c6833 removing defaultMountDir from the settings 2018-02-19 23:14:28 +01:00
infeo
c957f93ce6 activate reveal-method in vault again 2018-02-05 21:22:35 +01:00
infeo
b069a16f0c introduce new FuseEnvironment Interface such that the fuseNioAdapter gets os-dependent information from it 2018-02-05 21:20:29 +01:00
infeo
bf637f8361 reactivate reveal()-method of the vault 2018-02-04 00:12:18 +01:00
infeo
a2f6a85334 extended settingstest to check new setting-attributes 2018-02-03 22:18:28 +01:00
infeo
8a359704ca removed redundant maven dependency 2018-02-03 22:16:03 +01:00
infeo
e3b9601721 fixing a general setting not showing up on Mac OS 2018-02-03 17:42:48 +01:00
infeo
d170e87c1b integration of the fuseNioAdapter, including all the gui (controller & fxml) and settings wiring. english localization fitted and enriched for fuse 2018-02-03 17:26:59 +01:00
infeo
39d1d9c561 adapted vault class to nioAdapter Interface (and some other classes) 2018-02-03 17:15:51 +01:00
infeo
2914af5f7b reformatting & removing unused imports 2018-02-03 17:02:05 +01:00
infeo
fa10a92fa4 commit of the webDavNioAdapter 2018-02-03 16:44:07 +01:00
infeo
1e7478a89f commit of the nioAdapter Interface, implementation enum and the commandFailedException 2018-02-03 16:43:33 +01:00
Marc Stammerjohann
8ec2b10a4d #627: refactor adding trailing slash to copied WebDAV URL 2018-01-30 20:05:01 +01:00
Marc Stammerjohann
2001e768d4 add trailing slash when WebDAV Url gets copied to the clipboard 2018-01-29 11:23:07 +01:00
Sebastian Stenzel
79fd17250b updated dependency 2018-01-06 08:07:35 +01:00
Sebastian Stenzel
b8ee19b395 fixing use of desktop features on headless platform 2017-12-30 21:05:01 +01:00
Sebastian Stenzel
08cfcffa72 updated CI config 2017-12-30 20:49:25 +01:00
Sebastian Stenzel
9e82739c16 fixed dependency version 2017-12-30 20:22:59 +01:00
Sebastian Stenzel
6534242275 updated dependencies and CI config 2017-12-30 20:19:27 +01:00
Marc Stammerjohann
cc40d05e44 #79: replace shortcut with CRTL + NUM 2017-12-22 12:53:53 +01:00
Marc Stammerjohann
5fcbe7eff1 #79: add shortcut to navigate through vaults 
* CTRL + UP
* CTRL + DOWN
 2017-12-21 14:00:51 +01:00
Sebastian Stenzel
4be842aff5 first attempt of building Cryptomator with jdk9 2017-12-20 18:42:16 +01:00
Marc Stammerjohann
e808db51a5 #114: show success message 
* after creating a vault
* after changing password
* after upgrade
 2017-12-20 15:50:31 +01:00
Sebastian Stenzel
8e1bb121bb Merge branch 'release/1.3.3' into develop 
[ci skip]
 2017-11-28 00:33:08 +01:00
Sebastian Stenzel
355c1934f9 Merge branch 'release/1.3.3' 1.3.3 2017-11-28 00:32:22 +01:00
Sebastian Stenzel
b47ced1173 Preparing 1.3.3 2017-11-28 00:04:11 +01:00
Sebastian Stenzel
a66e08ee9b No longer using Files.isRegularFile(), fixing "add existing vault located on OneDrive's FoD" 2017-11-27 16:20:35 +01:00
Sebastian Stenzel
ad27094d63 Merge branch 'release/1.3.2' into develop 
Fixes #554, fixes #542
 2017-11-25 17:29:39 +01:00
Sebastian Stenzel
0be97b309b Merge branch 'release/1.3.2' 1.3.2 2017-11-25 17:27:51 +01:00
Sebastian Stenzel
b8de68bf3b Preparing 1.3.2 2017-11-25 17:03:24 +01:00
Sebastian Stenzel
f9dba09003 more password field focus fixes 2017-11-25 16:37:51 +01:00
Sebastian Stenzel
a428e62891 more password field focus fixes 2017-11-24 22:01:31 +01:00
Sebastian Stenzel
424ea8429c focusing password fields on a few more occasions 2017-11-24 21:22:59 +01:00
Sebastian Stenzel
a52adc1871 request focus on password field after selecting a vault 2017-11-24 20:16:16 +01:00
Sebastian Stenzel
08d5335b74 unwobblyfied win theme (focus border) 2017-11-24 20:15:07 +01:00
Sebastian Stenzel
8741c64b86 updated dependencies 2017-11-24 20:14:38 +01:00