mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 01:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,138 Commits 29 Branches 213 Tags
a30db34c1994e94de85f8e8fc59166add04424d3
Commit Graph

5138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
b64f7cc7a8 Reverting commit 296848b41e, reopen #542 2017-11-23 12:48:57 +01:00
Sebastian Stenzel
f84760746f Updated localizations, added Thai 2017-11-23 12:08:22 +01:00
armin
296848b41e fixes #542 2017-11-21 16:54:08 +01:00
Sebastian Stenzel
51e6ee5be5 fixes #592 2017-11-20 17:45:05 +01:00
armin
9d5609b129 Added highlighting of focused UI elements in windows and linux, for mac it is still missing (see issue #547) 2017-11-20 15:32:24 +01:00
armin
e18d62d57f closes #547 2017-11-17 23:54:00 +01:00
Markus Kreusch
9ff710ddf5 Forcing RMI to use sotimeout set by socket factory 2017-11-16 15:29:11 +01:00
Sebastian Stenzel
02f3f5ad53 fixed log message [ci skip] 2017-11-16 14:56:16 +01:00
Sebastian Stenzel
40caba847b Removes ipc port file after shutdown, reduced so timeout for rmi clients 2017-11-16 14:54:54 +01:00
Sebastian Stenzel
467e242df4 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into develop 2017-11-14 18:14:01 +01:00
Sebastian Stenzel
a7c42c3d59 Removed use of Files.isRegularFile from UI module, references #592 2017-11-14 18:12:22 +01:00
Markus Kreusch
ecdd3bc5ec Fixes #600 2017-11-10 15:04:21 +01:00
armin
46cab2ef9a Merge branch 'develop' of https://github.com/cryptomator/cryptomator into develop 2017-11-06 13:55:42 +01:00
Sebastian Stenzel
a7b036d441 fixes #598 2017-11-02 11:16:41 +01:00
armin
17bbd9161f adapted project-files such that project can be used with intellij IDEA IDE 2017-10-24 18:04:19 +02:00
Sebastian Stenzel
a850e8b816 Added unit tests for vault format "3 to 4" migration 2017-10-19 13:10:29 +02:00
Sebastian Stenzel
95b8240a21 fixed vault migration version 3 to 4: conflicting .lng files are now properly migrated 2017-10-18 12:35:20 +02:00
Sebastian Stenzel
69d379d03b fixes #583 2017-10-18 12:34:53 +02:00
Sebastian Stenzel
1b9951e90e Merge pull request #586 from hodyroff/patch-1 
Add ownCloud
 2017-09-27 16:21:57 +02:00
hodyroff
e62e9a1dff Add ownCloud 
Cryptomator is used by many ownCloud users and the interview and installation guidance was well received.
 2017-09-27 15:54:08 +02:00
Sebastian Stenzel
6d1989bbfe Merge pull request #580 from swiesend/develop 
Hide tmp file under Linux
 2017-09-12 12:28:27 +02:00
swiesend
c41973a8d6 Hide tmp file under Linux 2017-09-12 11:31:31 +02:00
Sebastian Stenzel
f84bb4710f Updated webdav-nio-adapter to 1.0.0 2017-08-16 21:06:28 +02:00
Tobias Hagemann
d1a9233557 fixed #567: added drag & drop support for password fields 2017-08-07 11:04:44 +02:00
Tobias Hagemann
1a73f84d83 updated issue template [ci skip] 2017-08-03 14:15:39 +02:00
Sebastian Stenzel
36cf3c2283 fixes #546, fixes #557 2017-07-26 16:17:02 +02:00
Marc Stammerjohann
091fab90ee fix english typo [ci skip] 2017-07-25 16:01:02 +08:00
Sebastian Stenzel
d81bf2e301 Update README.md 
This is the 1000th commit! 🎉
[ci skip]
 2017-07-22 01:29:08 +02:00
Tobias Hagemann
cd3cf3da0e updated issue template [ci skip] 2017-07-21 16:11:04 +02:00
Tobias Hagemann
3e961dabdd updated readme [ci skip] 2017-07-21 15:50:27 +02:00
Sebastian Stenzel
dde7d263b9 Merge branch 'release/1.3.1' into develop 2017-07-04 15:41:56 +02:00
Sebastian Stenzel
ff373b9a3f Merge branch 'release/1.3.1' 1.3.1 2017-07-04 15:41:20 +02:00
Sebastian Stenzel
0a7d102981 Some controllers no longer singleton, preventing reuse of internal states. Fixes #537 2017-07-04 15:41:03 +02:00
Sebastian Stenzel
10867e87c9 Preparing release 1.3.1 2017-07-04 13:20:03 +02:00
Sebastian Stenzel
7900f0ea8c fixes #536 2017-07-04 13:03:13 +02:00
Sebastian Stenzel
f0d364a6c5 formatting [ci skip] 2017-07-01 14:49:49 +02:00
Sebastian Stenzel
5ed50c50c7 Merge branch 'release/1.3.0' into develop 2017-07-01 14:48:23 +02:00
Sebastian Stenzel
020f12a2a9 Merge branch 'release/1.3.0' 1.3.0 2017-07-01 14:46:42 +02:00
Sebastian Stenzel
8aa5a8d7e8 Preparing 1.3.0 2017-07-01 14:38:46 +02:00
Sebastian Stenzel
72733f556c Merge branch 'release/1.3.0-rc9' into develop 2017-06-30 13:41:05 +02:00
Sebastian Stenzel
0fa03e05a8 Merge branch 'release/1.3.0-rc9' 1.3.0-rc9 2017-06-30 13:40:28 +02:00
Sebastian Stenzel
b7ac5dcf88 preparing 1.3.0-rc9 2017-06-30 13:37:11 +02:00
Sebastian Stenzel
0ce48fab25 mount "cryptomator-vault" instead of 127.0.0.1, if this happens to be an localhost alias (references #529) 2017-06-30 12:55:33 +02:00
Sebastian Stenzel
f50766c684 updated readme.md 2017-06-28 16:29:11 +02:00
Sebastian Stenzel
6dc597f826 Merge branch 'release/1.3.0-rc8' into develop 2017-06-28 11:39:11 +02:00
Sebastian Stenzel
509f132bc8 Merge branch 'release/1.3.0-rc8' 1.3.0-rc8 2017-06-28 11:37:38 +02:00
Sebastian Stenzel
096e063754 Dependency cleanup 2017-06-28 11:25:42 +02:00
Sebastian Stenzel
5e621eb0fb Preparing 1.3.0-rc8 2017-06-28 11:12:00 +02:00
Sebastian Stenzel
4e5edc834f fixes #526 2017-06-28 11:10:35 +02:00
Tobias Hagemann
4de1ac6e40 updated localizations [ci skip] 2017-06-27 16:58:45 +02:00