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
Sebastian Stenzel b0ab46b7b6 Removed copy WebDAV URL button 2018-05-14 21:04:00 +02:00
infeo 9107d296c3 fixes partially #660 2018-04-09 18:07:04 +02:00
Sebastian Stenzel 6be95963a1 moved issue templates to .github directory 
[ci skip]
 2018-04-07 00:42:08 +02:00
Sebastian Stenzel 09c9361e94 Merge branch 'release/1.4.0-beta1' into develop 
[ci skip]
 2018-04-06 16:55:22 +02:00
Sebastian Stenzel 5e7cea216d Merge branch 'release/1.4.0-beta1' 1.4.0-beta1 2018-04-06 16:54:12 +02:00
Sebastian Stenzel 6d91992102 preparing 1.4.0-beta1 2018-04-06 16:31:08 +02:00
Sebastian Stenzel 5a23ee0be6 updated dependencies 2018-04-06 16:29:40 +02:00
Sebastian Stenzel 31e186dd15 bumped fuse version 2018-04-05 23:24:47 +02:00
Sebastian Stenzel c7beb4a93c Default to FUSE. Use WebDAV as Backup, if FUSE isn't supported continuous 2018-04-03 17:32:26 +02:00
Sebastian Stenzel 6aff94a8f8 Merge tag '1.3.5' into develop 
1.3.5

# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/pom.xml
#	main/jacoco-report/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
 2018-04-03 10:41:43 +02:00
Sebastian Stenzel 273f6907c9 Merge branch 'hotfix/1.3.5' 1.3.5 2018-04-03 10:41:03 +02:00
Sebastian Stenzel 95df963913 Updated CryptoFS to version 1.5.1, fixing #643 2018-04-03 10:32:40 +02:00
infeo 13c5e2470b UI improvement: adding checkbox before textbox for entering own mountpath is given 2018-03-30 12:43:50 +02:00
Sebastian Stenzel 2341440ed9 Merge tag '1.3.4' into develop 
1.3.4

# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/pom.xml
#	main/jacoco-report/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
 2018-03-29 13:26:13 +02:00
Sebastian Stenzel 558f4be945 Merge branch 'hotfix/1.3.4' 1.3.4 2018-03-29 13:25:44 +02:00
Sebastian Stenzel d63735df1a bumped version to 1.3.4 2018-03-29 13:24:12 +02:00
Sebastian Stenzel 8be9cbbab7 Merge tag '1.3.4' into develop 
1.3.4

# Conflicts:
#	.travis.yml
 2018-03-29 12:58:53 +02:00
Sebastian Stenzel 191d7561f0 Merge branch 'hotfix/1.3.4' 2018-03-29 12:58:03 +02:00
Sebastian Stenzel 49a6fe9571 updated api key for github releases 2018-03-29 12:57:18 +02:00
Sebastian Stenzel 8b85fa5928 Merge tag '1.3.4' into develop 
1.3.4

# Conflicts:
#	.travis.yml

[ci skip]
 2018-03-29 12:42:39 +02:00
Sebastian Stenzel 2695979ae2 Merge branch 'hotfix/1.3.4' 2018-03-29 12:40:11 +02:00
Sebastian Stenzel f2212169be updated api key for github releases 2018-03-29 12:39:32 +02:00
Sebastian Stenzel 5898a4d584 Merge tag '1.3.4' into develop 
1.3.4

# Conflicts:
#	main/pom.xml
 2018-03-29 12:17:34 +02:00
Sebastian Stenzel 42b5b2663e Merge branch 'hotfix/1.3.4' 2018-03-29 12:16:57 +02:00
Sebastian Stenzel a0a867474b updated dependencies 2018-03-29 12:16:37 +02:00
Sebastian Stenzel c98f7f8574 fixes #645 2018-03-29 12:06:49 +02:00
Sebastian Stenzel fae2e19b96 try to set icon and window title on Linux. Might still be buggy, see https://bugs.openjdk.java.net/browse/JDK-8092837 2018-03-28 17:59:46 +02:00
Sebastian Stenzel 45548a0023 jq is already installed on Travis container environment 2018-03-27 17:48:28 +02:00
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