Sebastian Stenzel
99fce8d0b7
automatically resolve conflicts for directory files, that contain the same directory ID
2016-05-23 11:02:44 +02:00
Sebastian Stenzel
bf05c59c3b
Transparent conflict detection for long file names
2016-05-22 15:16:32 +02:00
Sebastian Stenzel
3dcebb1e1f
fixed minor copy/paste error
2016-05-22 13:32:16 +02:00
Sebastian Stenzel
fe3efdf610
Merge pull request #269 from jncharon/master
...
fixes #56
2016-05-21 14:07:15 +02:00
jncharon
5f4ae46f82
Replaced the MouseListner by a MouseAdapter
2016-05-20 21:30:33 +02:00
jncharon
deef325319
Implementation of github issue #56
2016-05-20 19:29:53 +02:00
jncharon
fbe00a8fe3
Merge remote-tracking branch 'refs/remotes/cryptomator/master'
2016-05-16 14:20:55 +02:00
Sebastian Stenzel
dc87dade43
Merge pull request #259 from jncharon/issue-228-fixed
...
Fixes #228 .
Still need to check license of icons, will discuss this with @MuscleRumble, who has a lot of icons that we bought the license for. If necessary we will change them.
2016-05-16 12:53:53 +02:00
Jean-Noël Charon
ba1625b5ad
Merge pull request #2 from overheadhunter/issue-228-fixed
...
Reverted commit c0f4a2b
2016-05-16 12:14:38 +02:00
Sebastian Stenzel
f6b126415e
added IntelliJ files to .gitignore
2016-05-16 10:00:39 +02:00
Sebastian Stenzel
9147e1c08b
Revert "Fucking .idea files I could not remove from the vcs"
...
This reverts commit c0f4a2b0d3
2016-05-16 09:57:10 +02:00
Sebastian Stenzel
6c18103662
Remove files with non-decryptable names from dir listings
2016-05-13 18:59:06 +02:00
Sebastian Stenzel
6fc343ea12
more fault-tolerant behaviour when mapping of long filenames couldn't be found.
2016-05-13 14:10:37 +02:00
Sebastian Stenzel
d304d66cdd
Updated localizations [ci skip]
2016-05-12 19:23:24 +02:00
Sebastian Stenzel
2ce9143b85
Merge branch 'conflict-detection'
2016-05-12 19:14:48 +02:00
Sebastian Stenzel
1c54e4f4ad
in the unlikely event of an alternative name already being used, choose a new random conflict id.
2016-05-12 16:13:03 +02:00
Sebastian Stenzel
9fd6f2ecae
transparently show sync conflicts ( fixes #98 )
2016-05-12 16:08:52 +02:00
Sebastian Stenzel
0d9f8eefc0
Using pattern based filename filtering
...
This is a preparation for finding valid encrypted names inside filenames that include additional characters
2016-05-12 11:51:14 +02:00
Sebastian Stenzel
40a1530f19
repeated commit 86000ac
2016-05-10 14:52:30 +02:00
Sebastian Stenzel
0477a0a2e3
Merge branch 'patches-1.0.x'
...
# Conflicts:
# main/filesystem-charsets/pom.xml
2016-05-10 14:49:20 +02:00
Sebastian Stenzel
b77d4b5ae2
fixes #264
2016-05-10 14:33:21 +02:00
Sebastian Stenzel
7b6c5318c5
fixes #263
2016-05-10 14:31:55 +02:00
Sebastian Stenzel
6006d65ce0
new ant kit using a custom launcher binary due to #265
2016-05-10 14:26:06 +02:00
jncharon
2b01b76926
Merge remote-tracking branch 'refs/remotes/cryptomator/master'
2016-05-08 17:52:14 +02:00
Sebastian Stenzel
dcea9e21f0
added module to code coverage report
2016-05-07 15:00:20 +02:00
Sebastian Stenzel
78645ecdf6
fixes #264
2016-05-07 14:40:44 +02:00
Sebastian Stenzel
91646dd93d
Merge branch 'password-strength'
...
Added password strength meter by Jean-Noël Charon, closing issue #198
2016-05-06 18:59:26 +02:00
jncharon
fca146e939
Merge remote-tracking branch 'remotes/origin/master' into issue-228-fixed
2016-05-05 21:22:28 +02:00
jncharon
62aa3ccc7f
Merge remote-tracking branch 'refs/remotes/cryptomator/master' into issue-228-fixed
2016-05-05 21:12:53 +02:00
jncharon
c0f4a2b0d3
Fucking .idea files I could not remove from the vcs
2016-05-05 21:11:57 +02:00
Tobias Hagemann
68ee89af98
updated bot welcome asset [ci skip]
2016-05-03 19:12:21 +02:00
Sebastian Stenzel
ad2c9116b9
Release 1.0.4
2016-05-03 16:50:18 +02:00
Sebastian Stenzel
8e24745b3e
Merge branch 'master' into patches-1.0.x
2016-05-03 16:46:18 +02:00
Sebastian Stenzel
08f664e3df
Throttle calls to Settings.save()
2016-05-03 16:44:22 +02:00
Tobias Hagemann
b6d1d1dc22
updated linux app icon [ci skip]
2016-05-03 16:07:30 +02:00
Sebastian Stenzel
a0ef02b95c
fixes #237
2016-05-03 13:17:45 +02:00
Sebastian Stenzel
a6cefe67c4
setting default port to 42427 [ci skip]
2016-05-03 10:48:24 +02:00
Sebastian Stenzel
be2b63ab2a
support for UTF-8 localization files
2016-05-02 22:28:49 +02:00
Sebastian Stenzel
78f11b4a5e
added korean localization [ci skip]
2016-05-02 16:01:28 +02:00
Sebastian Stenzel
0f20c7c3c9
fixes #209
2016-05-02 12:36:31 +02:00
Sebastian Stenzel
d4235174f7
imported localizations from POEditor fixes #231 and #234 (ci skip)
2016-05-02 11:37:40 +02:00
Sebastian Stenzel
f16be84aa3
restored bash-based webdav mounting for OS X before 10.10 (issue #211 - to be tested)
2016-05-02 11:11:42 +02:00
Sebastian Stenzel
833f2d8566
fixed travis test coverage configuration
2016-04-27 01:18:37 +02:00
Sebastian Stenzel
c02a63878e
new method to calculate test coverage (across modules)
2016-04-27 01:14:41 +02:00
jncharon
6deb30307e
Merge remote-tracking branch 'cryptomator/master'
2016-04-24 13:47:37 +02:00
jncharon
7357829741
Fix in the background color of the dialog boxes
2016-04-23 23:42:28 +02:00
jncharon
4bd04150c1
Implementation of github issue 228
2016-04-23 23:37:56 +02:00
Sebastian Stenzel
ac9fe28967
Merge branch 'master' into patches-1.0.x
...
Release 1.0.3d
2016-04-22 10:55:03 +02:00
Sebastian Stenzel
515755d84a
updated antkit to support deb and rpm packages [ci skip]
2016-04-22 10:53:51 +02:00
Sebastian Stenzel
cf35772c18
Merge pull request #239 from jncharon/master
...
Fix in the change password screen
2016-04-21 09:11:23 +02:00
