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
infeo 019b7ac643 refactoring inconsistent method in vault class 2018-07-17 18:18:23 +02:00
infeo 7392a99da5 small ui fix: text for using individual mount path is not shown completely 2018-07-17 18:17:27 +02:00
Sebastian Stenzel e909269ae0 Merge tag '1.4.0-beta2' into develop 
1.4.0-beta2
 2018-07-12 15:22:42 +02:00
Sebastian Stenzel 45ad496f41 Merge branch 'release/1.4.0-beta2' 1.4.0-beta2 2018-07-12 15:21:50 +02:00
Sebastian Stenzel a272bf2614 preparing 1.4.0-beta2 2018-07-12 15:14:36 +02:00
infeo 119e0724d5 fixing broken option "reveal after mount" 2018-07-12 14:58:34 +02:00
Sebastian Stenzel 76a9cb9a06 using different threadpools for normal ExecutorService (will spawn threads on demand) and ScheduledExecutorService (limited to 4 scheduler threads) 2018-07-12 14:53:27 +02:00
infeo acb8d4cd0c fixing display issue when locking a vault and changign to another vault during the lock process 2018-07-12 11:53:44 +02:00
Sebastian Stenzel ffe8887114 no longer using jdk.incubator.httpclient, because windows app doesn't start with --add-modules arg in cfg file 2018-07-12 11:03:35 +02:00
Sebastian Stenzel d8c8c2380a trying to move coverage report to end of build to workaround https://github.com/travis-ci/travis-cookbooks/issues/989 2018-07-11 16:12:07 +02:00
Sebastian Stenzel fe5ce79802 updated mockito (restoring jdk 10 compatibility) 2018-07-11 15:52:07 +02:00
Sebastian Stenzel bf7a8686a6 fix build 2018-07-11 15:45:05 +02:00
Sebastian Stenzel 143070d02d Updated to JDK 10 2018-07-11 15:40:28 +02:00
Sebastian Stenzel 06827a7466 changed ant-kit format to zip (because windows..) 2018-07-10 22:57:33 +02:00
Sebastian Stenzel 5add862ce8 updated ant-kit 2018-07-10 17:44:22 +02:00
Sebastian Stenzel 2b8d7c6c3b linux logback configuration moved to https://github.com/cryptomator/cryptomator-linux 
[ci skip]
 2018-07-10 17:05:45 +02:00
Sebastian Stenzel f5da13d3b4 Updated ant-kit. To be used by Windows and Mac build as well 2018-07-10 16:59:07 +02:00
Sebastian Stenzel 03dfd3e887 Replaced AsyncTaskService by new Tasks utility using javafx.concurrent API 2018-07-10 14:51:33 +02:00
infeo 8241559362 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into develop 2018-07-09 18:43:51 +02:00
infeo c289040624 fixes a display error where a vault appeared unlocked even when a wrong password was given 2018-07-09 18:43:45 +02:00
Sebastian Stenzel 767acbd922 Merge pull request #689 from jellemdekker/feature/296-status-indicator-in-system-tray 
[Help needed] Different system tray icon is shown when one or more vaults are unlocked

fixes #296
 2018-07-09 17:54:47 +02:00
Tobias Hagemann ccd4cedb08 Unlocked tray icons for macOS 2018-07-09 17:37:16 +02:00
jellemdekker 0ddd6d767d Implemented confirmation dialog when graceful shutdown of Cryptomator fails, so that the user can try again or opt to shutdown forcefully. 2018-07-09 16:42:53 +02:00
jellemdekker 6a5a1e5bae Replaced spaces in indentation with tabs. 2018-07-09 14:56:22 +02:00
jellemdekker b3d76bb394 Created the unlocked version of the tray icon for every operating system except macOS. Uses the free-for-commercial-use 'Lock, open icon' from the Hawcons icon set by Yannick Lung over at Iconfinder.com: https://www.iconfinder.com/icons/314694/lock_open_icon 2018-07-06 17:43:43 +02:00
jellemdekker 1924a7dec9 Implemented that a different system tray icon is shown to indicate when one or more vaults are unlocked. The unlocked icons are placeholders and will updated visually in following commits. 2018-07-06 17:34:39 +02:00
Sebastian Stenzel b65da30899 Merge pull request #688 from Gregvh/fix-broken-links 
Fix broken links in CONTRIBUTING.md
[ci skip]
 2018-07-06 17:33:56 +02:00
Sebastian Stenzel 7de8b3da02 Merge pull request #686 from jellemdekker/bugfix/update-readme.md-build-dependency-java 
Updated minimum required version of Java Development Kit
[ci skip]
 2018-07-06 17:33:02 +02:00
Gregvh 48ac8da1a7 Fix broken links in CONTRIBUTING.md 2018-07-06 14:13:15 +02:00
jellemdekker 86ae35c7eb Updated minimum required version of Java Development Kit, because this has changed since Cryptomator version 1.4.0. Source: https://community.cryptomator.org/t/how-to-run-cryptomator-1-4-0-beta1-jar/1599/4 . Skipping over Java 9, because its support has already ended. Also, JCE unlimited strength policy files are now included in the JDK by default, so they no longer need to be mentioned separately. 2018-07-06 03:52:04 +02:00
infeo 8421a8fc7b updating version of dokany-nio-adapter 2018-07-05 16:44:13 +02:00
infeo b579e03bc8 workaround for the combination of windows + dokany + (automatic drive letter selection) 2018-06-28 16:55:00 +02:00
infeo 9217b11e61 adding automatic drive letter selection to dokany volume 2018-06-28 16:02:11 +02:00
Tobias Hagemann e16bd7373c updated dokany version [ci skip] 2018-06-22 17:00:48 +02:00
Sebastian Stenzel ef53561bf0 Improvements suggested in #598 2018-06-21 17:47:47 +02:00
Sebastian Stenzel 3165c4ba86 Add GPG signature for antkit.tar.gz, fixes #522 2018-06-17 23:22:48 +02:00
Sebastian Stenzel f1bf157cac Update stale.yml 
[ci skip]
 2018-06-17 16:20:00 +02:00
Sebastian Stenzel 9c75dd48dd Create no-response.yml 
[ci skip]
 2018-06-17 15:55:09 +02:00
Sebastian Stenzel 74d4b4ea47 Rename style.yml to stale.yml 
[ci skip]
 2018-06-17 15:49:19 +02:00
Sebastian Stenzel 6f66f4cbf1 Create style.yml 
[ci skip]
 2018-06-17 15:48:59 +02:00
Sebastian Stenzel 874c5506a7 Added Dokany to volume type setting. 
Restart no longer required, when changing preferred volume type.
References #207
 2018-06-17 14:19:22 +02:00
Sebastian Stenzel aed35c17c8 Added Dokany Support 
fixes #207
 2018-06-17 13:59:28 +02:00
Sebastian Stenzel 873e438759 merging jacoco reports via codacy, subproject no longer needed 2018-06-17 11:58:26 +02:00
Sebastian Stenzel 5b45893c7b Renamed CommandFailedException to VolumeException 2018-06-15 09:48:46 +02:00
Sebastian Stenzel 5515258af1 updated FUSE, fixed reveal after unlock 2018-06-14 17:37:32 +02:00
Sebastian Stenzel dd5d52d25a updated dependencies 2018-05-24 14:19:59 +02:00
Sebastian Stenzel 24236f3844 Merge commit '458866f7d6460e688897b851248c8a2c22dc80d1' into develop 2018-05-24 14:14:44 +02:00
Markus Kreusch 458866f7d6 Asking user once before enabling update check 2018-05-22 11:36:00 +02:00
Sebastian Stenzel 525b0a7982 updated dependencies 2018-05-14 21:38:22 +02:00
Sebastian Stenzel d53af61b58 Removed "Mount after unlock" option. Mounting/unmounting no longer visible to the user, but merged with unlocking/locking. 2018-05-14 21:37:38 +02:00