 Sebastian Stenzel
|
99fce8d0b7
automatically resolve conflicts for directory files, that contain the same directory ID
|
9 tahun lalu |
|
Sebastian Stenzel
|
bf05c59c3b
Transparent conflict detection for long file names
|
9 tahun lalu |
|
Sebastian Stenzel
|
3dcebb1e1f
fixed minor copy/paste error
|
9 tahun lalu |
 Sebastian Stenzel
|
fe3efdf610
Merge pull request #269 from jncharon/master
|
9 tahun lalu |
 jncharon
|
5f4ae46f82
Replaced the MouseListner by a MouseAdapter
|
9 tahun lalu |
|
jncharon
|
deef325319
Implementation of github issue #56
|
9 tahun lalu |
|
jncharon
|
fbe00a8fe3
Merge remote-tracking branch 'refs/remotes/cryptomator/master'
|
9 tahun lalu |
|
Sebastian Stenzel
|
dc87dade43
Merge pull request #259 from jncharon/issue-228-fixed
|
9 tahun lalu |
|
Jean-Noël Charon
|
ba1625b5ad
Merge pull request #2 from overheadhunter/issue-228-fixed
|
9 tahun lalu |
|
Sebastian Stenzel
|
f6b126415e
added IntelliJ files to .gitignore
|
9 tahun lalu |
|
Sebastian Stenzel
|
9147e1c08b
Revert "Fucking .idea files I could not remove from the vcs"
|
9 tahun lalu |
|
Sebastian Stenzel
|
6c18103662
Remove files with non-decryptable names from dir listings
|
9 tahun lalu |
|
Sebastian Stenzel
|
6fc343ea12
more fault-tolerant behaviour when mapping of long filenames couldn't be found.
|
9 tahun lalu |
|
Sebastian Stenzel
|
d304d66cdd
Updated localizations [ci skip]
|
9 tahun lalu |
|
Sebastian Stenzel
|
2ce9143b85
Merge branch 'conflict-detection'
|
9 tahun lalu |
|
Sebastian Stenzel
|
1c54e4f4ad
in the unlikely event of an alternative name already being used, choose a new random conflict id.
|
9 tahun lalu |
|
Sebastian Stenzel
|
9fd6f2ecae
transparently show sync conflicts (fixes #98)
|
9 tahun lalu |
|
Sebastian Stenzel
|
0d9f8eefc0
Using pattern based filename filtering
|
9 tahun lalu |
|
Sebastian Stenzel
|
40a1530f19
repeated commit 86000ac
|
9 tahun lalu |
|
Sebastian Stenzel
|
0477a0a2e3
Merge branch 'patches-1.0.x'
|
9 tahun lalu |
|
Sebastian Stenzel
|
b77d4b5ae2
fixes #264
|
9 tahun lalu |
|
Sebastian Stenzel
|
7b6c5318c5
fixes #263
|
9 tahun lalu |
|
Sebastian Stenzel
|
6006d65ce0
new ant kit using a custom launcher binary due to #265
|
9 tahun lalu |
|
jncharon
|
2b01b76926
Merge remote-tracking branch 'refs/remotes/cryptomator/master'
|
9 tahun lalu |
|
Sebastian Stenzel
|
dcea9e21f0
added module to code coverage report
|
9 tahun lalu |
|
Sebastian Stenzel
|
78645ecdf6
fixes #264
|
9 tahun lalu |
|
Sebastian Stenzel
|
91646dd93d
Merge branch 'password-strength'
|
9 tahun lalu |
|
jncharon
|
fca146e939
Merge remote-tracking branch 'remotes/origin/master' into issue-228-fixed
|
9 tahun lalu |
|
jncharon
|
62aa3ccc7f
Merge remote-tracking branch 'refs/remotes/cryptomator/master' into issue-228-fixed
|
9 tahun lalu |
|
jncharon
|
c0f4a2b0d3
Fucking .idea files I could not remove from the vcs
|
9 tahun lalu |
