Commit Graph

  • 034a667e07 Fixed problem with sync conflict resolver. Issue #311 Markus Kreusch 2016-08-11 11:19:12 +02:00
  • 008e3e3b05 Continue mounting also if command fails with error code. Issue #267 Markus Kreusch 2016-08-11 09:37:04 +02:00
  • 94a5bf7596 Continue mounting if reg.exe command fails. Issue #267 Markus Kreusch 2016-08-10 13:57:23 +02:00
  • e8db836eff Workaround for Issue #317 Markus Kreusch 2016-08-10 13:53:04 +02:00
  • 429b26f3d8 Added delay for requests on invalid vault ids. Issue #319 Markus Kreusch 2016-08-10 13:37:13 +02:00
  • 3ae8327300 Added unique id to vaults / webdav urls. Markus Kreusch 2016-08-10 13:07:41 +02:00
  • df7e9a0af1 Preventing post requests. Issue #319 Markus Kreusch 2016-08-09 20:02:06 +02:00
  • 93d3eca0ab Yet another header to prevent browsers from guessing mime types. Kudos to @LukasReschke Sebastian Stenzel 2016-08-09 17:42:24 +02:00
  • 7753d1f0e7 If GET request is made by a browser, the file in question is downloaded instead of being executed. Issue #318 Sebastian Stenzel 2016-08-09 17:35:17 +02:00
  • d7c6c24932 updated tavis config Sebastian Stenzel 2016-08-01 10:21:10 +02:00
  • 1a75f23081 Merge branch 'feature/mount-method-settings' into develop Sebastian Stenzel 2016-08-01 10:17:44 +02:00
  • f071efe1b9 allow user to specify whether to use dav:// or webdav:// scheme for Linux GVFS mounts. Fixes #307 Sebastian Stenzel 2016-07-25 10:08:21 +02:00
  • a8ad335aed Update README.md Sebastian Stenzel 2016-07-18 12:18:47 +02:00
  • 7022a80c95 Improved error handling Markus Kreusch 2016-07-14 13:58:17 +02:00
  • 9a2f602d6c fixes #270 Sebastian Stenzel 2016-07-13 12:37:40 +02:00
  • c78a4aa241 updated travis config [ci skip] Sebastian Stenzel 2016-07-11 22:14:35 +02:00
  • 975ce4d973 Merge branch 'release/1.1.3' 1.1.3 Tobias Hagemann 2016-07-11 21:16:23 +02:00
  • 1e6ff0d969 set version to 1.1.3 Tobias Hagemann 2016-07-11 21:14:35 +02:00
  • 69e133d561 Improved migration from vault version 3 to 4. Sebastian Stenzel 2016-07-11 18:07:55 +02:00
  • 20e55eddf8 Merge branch 'develop' 1.1.2 Sebastian Stenzel 2016-07-09 13:25:54 +02:00
  • 0fdcdc816a fixed unit test Sebastian Stenzel 2016-07-09 11:44:53 +02:00
  • b7506d97a9 Merge branch 'hotfix/1.1.2' Sebastian Stenzel 2016-07-09 13:25:03 +02:00
  • 4ad7481dc7 fixed unit test Sebastian Stenzel 2016-07-09 11:44:53 +02:00
  • bc815405d2 merged from hotfix/1.1.2 [ci skip] Sebastian Stenzel 2016-07-09 11:28:36 +02:00
  • 9c06e762c3 fixes #304 Sebastian Stenzel 2016-07-09 11:28:36 +02:00
  • 1ac87dd32f fixed NPE [ci skip] Sebastian Stenzel 2016-07-08 15:52:00 +02:00
  • e0ce7ce2ec Merge branch 'release/1.1.1' 1.1.1 Sebastian Stenzel 2016-07-08 11:59:39 +02:00
  • 3d951a9d7b set version to 1.1.1 Sebastian Stenzel 2016-07-07 14:48:49 +02:00
  • cec3d984b0 Merge branch 'develop' into release/1.1.1 Sebastian Stenzel 2016-07-07 14:39:20 +02:00
  • 392e474cfa Update tr.txt (POEditor.com) Sebastian Stenzel 2016-07-07 14:28:52 +02:00
  • 41fb0d51a4 Update es.txt (POEditor.com) Sebastian Stenzel 2016-07-07 14:28:51 +02:00
  • aa9fef2967 Update sk.txt (POEditor.com) Sebastian Stenzel 2016-07-07 14:28:49 +02:00
  • adc9c02564 Update ru.txt (POEditor.com) Sebastian Stenzel 2016-07-07 14:28:48 +02:00
  • ace64117a2 Update kr.txt (POEditor.com) Sebastian Stenzel 2016-07-07 14:28:46 +02:00
  • fb4db2506b Update it.txt (POEditor.com) Sebastian Stenzel 2016-07-07 14:28:45 +02:00
  • 1076d971ae Update hu.txt (POEditor.com) Sebastian Stenzel 2016-07-07 14:28:43 +02:00
  • eed1b1cff0 Update de.txt (POEditor.com) Sebastian Stenzel 2016-07-07 14:28:42 +02:00
  • f5cb82e21e Update fr.txt (POEditor.com) Sebastian Stenzel 2016-07-07 14:28:40 +02:00
  • 67661f114b Update nl.txt (POEditor.com) Sebastian Stenzel 2016-07-07 14:28:39 +02:00
  • 8a3e09764a only remove .cryptomator extension for vault version 3 Sebastian Stenzel 2016-07-07 14:25:55 +02:00
  • eb3cfd6e6a updated placeholders [ci skip] Sebastian Stenzel 2016-07-06 16:25:31 +02:00
  • 4d1727d0e9 Merge branch 'develop' into release/1.1.1 Sebastian Stenzel 2016-07-06 16:09:32 +02:00
  • a51d853d1c adjusted number format regex [ci skip] Sebastian Stenzel 2016-07-06 16:09:14 +02:00
  • d0039466f7 test technical correctness of localization files Sebastian Stenzel 2016-07-06 16:07:07 +02:00
  • 5c959989a2 Fixed Coverity defect 131711 Sebastian Stenzel 2016-07-05 23:18:18 +02:00
  • 6283d2df3d Merge branch 'feature/vault-version-4' into develop Sebastian Stenzel 2016-07-03 17:41:46 +02:00
  • a9e0dfdaf8 redesigned upgrade view Sebastian Stenzel 2016-07-03 17:38:46 +02:00
  • 45ca7e9e47 migration from vault version 3 to 4 Sebastian Stenzel 2016-07-03 16:16:23 +02:00
  • 034b5c2718 updated localizations [ci skip] Sebastian Stenzel 2016-07-01 11:13:51 +02:00
  • e188649c79 adjusted test to vault version 4 Sebastian Stenzel 2016-06-30 22:18:43 +02:00
  • 1468c6ec90 improved vault upgrading, preparation for migration to vault version 4 Sebastian Stenzel 2016-06-30 22:09:45 +02:00
  • 07ba4eb537 Using 0 prefix instead of _ suffix to mark directories Sebastian Stenzel 2016-06-30 18:02:13 +02:00
  • 414bbef1a7 updated key generation Sebastian Stenzel 2016-06-10 14:04:55 +02:00
  • e2b94ff6ef updated jacoco dependency Sebastian Stenzel 2016-06-08 19:11:56 +02:00
  • 41f8a9faca add "allow" response header field Sebastian Stenzel 2016-06-08 19:06:06 +02:00
  • 1d9252e974 updated description of file chooser's extension filter [ci skip] Tobias Hagemann 2016-06-07 01:07:54 +02:00
  • 80780eef3c Merge pull request #280 from aeris/fix-l10n-fr Sebastian Stenzel 2016-05-30 14:27:00 +02:00
  • 87ff33956b Enhanced fr translation Aeris 2016-05-30 13:45:40 +02:00
  • 1804b98f05 trigger coverity scans for only release branches [ci skip] Sebastian Stenzel 2016-05-25 15:47:19 +02:00
  • 847c6813cc started development of 1.2.0 [ci skip] Sebastian Stenzel 2016-05-25 15:37:07 +02:00
  • 1dde5ff6e7 release 1.1.0 1.1.0 Sebastian Stenzel 2016-05-25 15:17:40 +02:00
  • 76c9a19428 unset and set default buttons to make sure VK_ENTER triggers it Sebastian Stenzel 2016-05-25 12:29:49 +02:00
  • 25ee0519e1 some minor fixes - reset password field contents when changing a vault - hide "change password" option for uninitialized or missing vaults Sebastian Stenzel 2016-05-25 12:12:01 +02:00
  • c184089c35 oopsy daisy, wie das duftet... [ci skip] Sebastian Stenzel 2016-05-24 11:36:46 +02:00
  • d2bcc47857 Merge branch 'delete-confirmation' fixes #228 Sebastian Stenzel 2016-05-24 11:35:17 +02:00
  • 34629a69ea Using ControlsFX's BSD-licensed assets for dialogs, rather than OpenJDK's GPL licensed ones. Adjusted dialog styles for Linux and Windows. [ci skip] Sebastian Stenzel 2016-05-24 11:32:27 +02:00
  • 92c87f7b84 changed dialog L&F on OS X Sebastian Stenzel 2016-05-23 19:31:18 +02:00
  • 0dd96635ac code cleanup [ci skip] Sebastian Stenzel 2016-05-23 13:24:53 +02:00
  • 048c44a6e4 Update README.md Sebastian Stenzel 2016-05-23 12:36:58 +02:00
  • 06910ad1f4 fixes #229 Sebastian Stenzel 2016-05-23 12:11:45 +02:00
  • 02a0f3acc6 fixed invariant FolderChildrenTests Sebastian Stenzel 2016-05-23 11:18:24 +02:00
  • 851f9240b7 updated link to MAC warning FAQ Sebastian Stenzel 2016-05-23 11:02:56 +02:00
  • 99fce8d0b7 automatically resolve conflicts for directory files, that contain the same directory ID Sebastian Stenzel 2016-05-23 11:02:44 +02:00
  • bf05c59c3b Transparent conflict detection for long file names Sebastian Stenzel 2016-05-22 15:16:32 +02:00
  • 3dcebb1e1f fixed minor copy/paste error Sebastian Stenzel 2016-05-22 13:32:16 +02:00
  • fe3efdf610 Merge pull request #269 from jncharon/master Sebastian Stenzel 2016-05-21 14:07:15 +02:00
  • 5f4ae46f82 Replaced the MouseListner by a MouseAdapter jncharon 2016-05-20 21:30:33 +02:00
  • deef325319 Implementation of github issue #56 jncharon 2016-05-20 19:29:53 +02:00
  • fbe00a8fe3 Merge remote-tracking branch 'refs/remotes/cryptomator/master' jncharon 2016-05-16 14:20:55 +02:00
  • dc87dade43 Merge pull request #259 from jncharon/issue-228-fixed Sebastian Stenzel 2016-05-16 12:53:53 +02:00
  • ba1625b5ad Merge pull request #2 from overheadhunter/issue-228-fixed Jean-Noël Charon 2016-05-16 12:14:38 +02:00
  • f6b126415e added IntelliJ files to .gitignore Sebastian Stenzel 2016-05-16 10:00:39 +02:00
  • 9147e1c08b Revert "Fucking .idea files I could not remove from the vcs" Sebastian Stenzel 2016-05-16 09:57:10 +02:00
  • 6c18103662 Remove files with non-decryptable names from dir listings Sebastian Stenzel 2016-05-13 18:59:06 +02:00
  • 6fc343ea12 more fault-tolerant behaviour when mapping of long filenames couldn't be found. Sebastian Stenzel 2016-05-13 14:10:37 +02:00
  • d304d66cdd Updated localizations [ci skip] Sebastian Stenzel 2016-05-12 19:23:24 +02:00
  • 2ce9143b85 Merge branch 'conflict-detection' Sebastian Stenzel 2016-05-12 19:14:48 +02:00
  • 1c54e4f4ad in the unlikely event of an alternative name already being used, choose a new random conflict id. Sebastian Stenzel 2016-05-12 16:13:03 +02:00
  • 9fd6f2ecae transparently show sync conflicts (fixes #98) Sebastian Stenzel 2016-05-12 16:08:52 +02:00
  • 0d9f8eefc0 Using pattern based filename filtering This is a preparation for finding valid encrypted names inside filenames that include additional characters Sebastian Stenzel 2016-05-12 11:51:14 +02:00
  • 5f22bd5785 Increased version number to 1.0.5 1.0.5 Sebastian Stenzel 2016-05-10 14:55:02 +02:00
  • 7312c0f9db repeated commit 86000ac Sebastian Stenzel 2016-05-10 14:52:30 +02:00
  • 40a1530f19 repeated commit 86000ac Sebastian Stenzel 2016-05-10 14:52:30 +02:00
  • 0477a0a2e3 Merge branch 'patches-1.0.x' Sebastian Stenzel 2016-05-10 14:49:20 +02:00
  • b77d4b5ae2 fixes #264 Sebastian Stenzel 2016-05-07 14:40:44 +02:00
  • 7b6c5318c5 fixes #263 Sebastian Stenzel 2016-05-10 14:31:55 +02:00
  • 6006d65ce0 new ant kit using a custom launcher binary due to #265 Sebastian Stenzel 2016-05-10 14:26:06 +02:00
  • 2b01b76926 Merge remote-tracking branch 'refs/remotes/cryptomator/master' jncharon 2016-05-08 17:52:14 +02:00
  • dcea9e21f0 added module to code coverage report Sebastian Stenzel 2016-05-07 15:00:20 +02:00
  • 78645ecdf6 fixes #264 Sebastian Stenzel 2016-05-07 14:40:44 +02:00