Sebastian Stenzel
db0aceefdf
Merge branch 'develop' into feature/375-readonly
...
# Conflicts:
# main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
# main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
# main/ui/src/main/resources/fxml/unlock.fxml
2019-02-08 15:28:40 +01:00
Sebastian Stenzel
492e986608
Custom mount point now selected via DirectoryChooser. Fixes #762
2019-02-08 12:32:00 +01:00
Sebastian Stenzel
98cab7e4d8
Delete automatically generated mount point after locking, attempt to fix #773
2019-01-31 15:38:05 +01:00
Sebastian Stenzel
384c9de7aa
disabled spell checks [ci skip]
2019-01-31 15:37:20 +01:00
Sebastian Stenzel
528005a623
fixes #752
2019-01-31 15:37:01 +01:00
Tobias Hagemann
c78d4c2d0e
Updated localizations, added Catalan
2019-01-27 14:57:03 +01:00
Sebastian Stenzel
c8e9201692
Merge branch 'master' into develop
2019-01-17 13:06:26 +01:00
Sebastian Stenzel
536da2621a
Merge branch 'release/1.4.2'
2019-01-17 13:02:58 +01:00
Sebastian Stenzel
6167eeecb4
Preparing 1.4.2
2019-01-17 13:00:36 +01:00
Sebastian Stenzel
9cc873a344
No longer assigning drive letters A-C to fix problems with older Dokany versions
2019-01-17 11:38:48 +01:00
Sebastian Stenzel
b539590d7a
updated IDE settings and removed duplicate gitignore [ci skip]
2019-01-17 11:07:01 +01:00
Tobias Hagemann
5209bef1a9
Merge branch 'master' into develop
2019-01-16 16:55:53 +01:00
Tobias Hagemann
ee5505362c
Merge branch 'release/1.4.1'
2019-01-16 16:50:44 +01:00
Tobias Hagemann
82f388d420
Preparing 1.4.1
2019-01-16 16:38:37 +01:00
Tobias Hagemann
70e733f341
Updated localizations
2019-01-16 16:27:00 +01:00
Tobias Hagemann
3af5d5f267
Repositioned messageText in unlock, updated "unlock.pendingMessage.unlocking" copy
2019-01-16 16:23:03 +01:00
Sebastian Stenzel
28bf9e2ab1
fixes #732
2019-01-16 16:10:11 +01:00
Sebastian Stenzel
2f3a576de9
Renewed BINTRAY_API_KEY [ci skip]
2019-01-16 16:02:52 +01:00
Armin Schrenk
bbe1ef3dbc
Feature/custom mount point generalizing ( #797 )
...
* changing naming of individual mout path property
* adding input/output for the new custom mount points
* ui integration of custom mount point
* removing unused variable
* Improving UX
* Simplify mountPathProperty and implement its usage
* reverting renaming of Properties concerning the usage of own mount point (rescheduled for 1.5.0)
* changing displayed message when no mount path given
* fixing ui error
* applying suggestion of comment 7338fda418 (r248254180)
2019-01-16 15:08:00 +01:00
Tobias Hagemann
078a127182
Shortened "welcome.askForUpdateCheck.dialog.content" copy
2019-01-16 14:15:26 +01:00
Tobias Hagemann
240bf122dd
Hide "check for updates" indicator by default
2019-01-16 14:00:32 +01:00
Sebastian Stenzel
f2f8f9b28c
added intellij project configuration
2019-01-15 13:15:38 +01:00
Sebastian Stenzel
af03e0d73d
updated dagger [ci skip]
2019-01-15 13:07:39 +01:00
Sebastian Stenzel
7844078203
Merge pull request #784 from jellemdekker/bugfix/771_abort_graceful_shutdown_dialog
...
Added a Cancel button to the graceful shutdown-dialog
2019-01-14 13:05:40 +01:00
Armin Schrenk
da62a22faf
fixes #750
2019-01-09 17:59:41 +01:00
Armin Schrenk
c36a1a4aef
closes #711
2019-01-09 17:58:23 +01:00
Armin Schrenk
f760347d9d
fixes #787
2019-01-09 15:28:05 +01:00
Armin Schrenk
8fc647eb2b
Updating Apache Commons libraries
2019-01-09 15:26:02 +01:00
jellemdekker
69b1bf5a26
Added a Cancel button to the graceful shutdown-dialog. Fixes issue #771 .
2018-12-22 12:53:42 +01:00
Sebastian Stenzel
6951edac96
fixes #770
2018-12-05 18:22:48 +01:00
Sebastian Stenzel
76c84b34e9
bumped version
2018-11-05 10:46:39 +01:00
Sebastian Stenzel
1362720011
Merge branch 'master' into develop
...
[ci skip]
2018-10-31 16:21:48 +01:00
Sebastian Stenzel
3f15352ebf
Merge branch 'release/1.4.0-rc1'
2018-10-31 16:21:09 +01:00
Sebastian Stenzel
fdedee49d3
Preparing 1.4.0-rc1
2018-10-31 16:20:42 +01:00
Sebastian Stenzel
b506493c13
updated localization
2018-10-31 16:17:20 +01:00
Sebastian Stenzel
bc09f28120
updating dependencies
...
fixes #742 , fixes #705
2018-10-31 16:03:37 +01:00
Sebastian Stenzel
eba0935900
attempting to downgrade to oracle jdk 9 because of stupid jdk 10 deprecation
2018-10-31 15:56:18 +01:00
Armin Schrenk
050a6e6a57
use jdk 10 for 1.4.0 release
2018-10-31 15:22:00 +01:00
Armin Schrenk
dbcb407a7c
updating travis config
2018-10-31 14:41:30 +01:00
Armin Schrenk
b1acdf9e61
fixex #738
2018-10-31 14:13:03 +01:00
Armin Schrenk
9c6a0b3e0c
readjust columns in settings dialogue
2018-10-31 13:36:52 +01:00
Sebastian Stenzel
f6df442948
Merge branch 'master' into develop
...
[ci skip]
2018-10-15 14:37:05 +02:00
Sebastian Stenzel
29038a679f
Merge branch 'release/1.4.0-beta3'
2018-10-15 14:36:27 +02:00
Sebastian Stenzel
2e042423d0
Preparing 1.4.0-beta3
2018-10-15 14:35:34 +02:00
Sebastian Stenzel
e08c2b7dc3
updated dependencies
2018-10-11 00:31:22 +02:00
infeo
d5d0589dec
changing description of own mount point usage
2018-10-10 12:34:23 +02:00
infeo
a760edcab9
fixing settings bug under linux
2018-10-05 18:31:38 +02:00
infeo
a759455473
removing testsetting
2018-10-05 17:53:10 +02:00
Armin Schrenk
50d2f16f71
fixing ui bug: setting fields did not disappeared with mount adapter change
2018-10-05 17:42:35 +02:00
infeo
8afa09007b
aligning webdav port number textfield
2018-10-04 16:12:07 +02:00
