Commit Graph

1107 Commits

Author SHA1 Message Date
Sebastian Stenzel
8edd5326fa fixed if..elif..fi statement 2018-03-27 17:42:57 +02:00
Sebastian Stenzel
1d178674ce updated travis config 2018-03-27 17:39:09 +02:00
Sebastian Stenzel
7593d5cd40 using commit hash instead of timestamp for snapshot versions 2018-03-27 17:26:07 +02:00
Sebastian Stenzel
9e8f88f000 fixed ci build 2018-03-27 16:49:48 +02:00
Sebastian Stenzel
e1eafbc838 always delete continuous release from github releases
re-create it if untagged, otherwise create regular release
2018-03-27 16:42:01 +02:00
Sebastian Stenzel
f2107954b3 trying to force github releases to overwrite existing continuous release 2018-03-27 14:12:57 +02:00
Sebastian Stenzel
db3dabe3c5 clean target dir before re-building for deployment 2018-03-27 14:03:37 +02:00
Sebastian Stenzel
76f69dec34 fixing travis config 2018-03-27 13:53:44 +02:00
Sebastian Stenzel
1b130ab58e updated settings.xml, caching versions-maven-plugin 2018-03-27 13:17:43 +02:00
Sebastian Stenzel
a12e2ae6cd attempt to fix use of org.codehaus.mojo:versions-maven-plugin 2018-03-27 12:17:32 +02:00
Sebastian Stenzel
7441f67b03 fixing syntax errors 2018-03-27 11:51:56 +02:00
Sebastian Stenzel
d02d521856 fixing syntax errors 2018-03-27 11:46:22 +02:00
Sebastian Stenzel
e6dd14d0e5 Enabling continuous releases 2018-03-27 11:34:20 +02:00
infeo
e257d8e497 implementing the per-vault mount-directory-creation and just removing the id from the volume name 2018-03-23 17:05:15 +01:00
Tobias Hagemann
2d6d3084b0 updated localizations, added czech [ci skip] 2018-03-23 14:33:46 +01:00
Sebastian Stenzel
4fffc63869 new antkit for upcoming AppImage build (see issue #469) 2018-03-23 12:57:04 +01:00
Sebastian Stenzel
ce457ae20e No longer selecting first vault by default, when showing welcome screen after start of application. 2018-03-23 06:51:24 +01:00
Sebastian Stenzel
5b9efcc16f Merge commit 'cc40d05e44780cd52757e8afa0a917dce4f5a377' into develop
fixes #79
2018-03-23 06:47:46 +01:00
Sebastian Stenzel
28001710b3 Merge commit '8ec2b10a4d546b148ec2d6f75b284a636b2b9edf' into develop
# Conflicts:
#	main/ui/src/main/java/org/cryptomator/ui/model/Vault.java

fixes #627
2018-03-23 06:23:04 +01:00
Sebastian Stenzel
32e81796ae Merge commit '68445befeb17cee00c3b7d050edd0404ae3089d2' into develop 2018-03-23 06:16:31 +01:00
infeo
68445befeb simplifying the state enum to prevent illegal states 2018-03-22 17:47:43 +01:00
infeo
da31a9d2a0 integrating changes proposed by comments in commit e808db51a5 2018-03-22 15:21:11 +01:00
Sebastian Stenzel
9b3167c886 added dropdown css for mac 2018-03-17 19:11:06 +01:00
Sebastian Stenzel
7c1a0b5fdf Renamed nioAdapterImpl to volumeImpl. 2018-03-17 16:08:58 +01:00
Sebastian Stenzel
a666c80ef5 only initialize jetty on demand 2018-03-17 15:54:32 +01:00
Sebastian Stenzel
2610ef4645 Using enum instead of string to choose between FUSE and WebDAV 2018-03-17 15:44:27 +01:00
Sebastian Stenzel
357f659c8d Update README.md
[ci skip]
2018-03-13 12:13:16 +01:00
Sebastian Stenzel
19225c058d Include logback.xml in antkit, so .deb, .rpm and ppa releases can use it. fixes #650 2018-03-13 11:52:48 +01:00
Sebastian Stenzel
f1ee991d07 code format + exception handling 2018-03-06 16:31:08 +01:00
infeo
562daf990f reactivating reveal method 2018-03-06 12:32:23 +01:00
Sebastian Stenzel
19cd0d70e7 Merge branch 'feature/fuse-integration' into develop 2018-03-06 11:46:13 +01:00
Sebastian Stenzel
d38b488ee0 using customized maven settings.xml 2018-03-06 11:42:56 +01:00
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