Klaas Freitag
a84332c910
Improved C style and added more tests.
2013-03-26 12:00:57 +01:00
Klaas Freitag
79c51540da
Check for file equalness after having created a conflict file.
...
If the files are equal and the conflict was created because the
timestamps were screwed the conflict is removed again. This only
works on the local repository so far.
Conflicts:
src/csync_propagate.c
2013-03-26 11:57:32 +01:00
Klaas Freitag
0baa80c235
Test added for c_compare_file.
2013-03-26 11:53:14 +01:00
Klaas Freitag
a71aef1731
Added c_compare_file function and test - WIP.
2013-03-26 11:52:46 +01:00
Klaas Freitag
466faba761
Fix test script.
2013-03-26 10:06:00 +01:00
Klaas Freitag
6aec7f4211
Push context to module to make logging of the module work.
2013-03-26 10:05:15 +01:00
Daniel Molkentin
0ad2bd4b91
Add favlink generation support for Nautilus
2013-03-25 18:00:58 +01:00
Daniel Molkentin
dcc8f9fa6c
Fix favlink manual test
2013-03-25 18:00:25 +01:00
Markus Goetz
d7a93c74aa
OS X: Fix creation of Finder Favorite
2013-03-25 14:57:34 +01:00
Daniel Molkentin
408547611b
Manual test for favlinks
2013-03-25 12:53:40 +01:00
rominf
a8f0e79046
Skipping folders with no absolute path.
2013-03-23 10:48:37 +04:00
Jenkins for ownCloud
3e45147497
[tx-robot] updated from transifex
2013-03-23 00:07:09 +01:00
Klaas Freitag
ef7c5c261d
Fix memory allocation for path.
2013-03-22 21:48:01 +01:00
Klaas Freitag
43fa6e4418
Check for file equalness after having created a conflict file.
...
If the files are equal and the conflict was created because the
timestamps were screwed the conflict is removed again. This only
works on the local repository so far.
2013-03-22 21:04:09 +01:00
Klaas Freitag
5657ff3d34
Fix: set path correctly.
2013-03-22 16:29:04 +01:00
Daniel Molkentin
48310d3f5e
Add 1.2.2 changelog
2013-03-22 14:59:22 +01:00
Daniel Molkentin
1831a975eb
SSLErrorDialog: We cannot use the existing key chain
...
... use the one returned by the new server instead.
2013-03-22 14:59:22 +01:00
Klaas Freitag
a3f29967f7
Test added for c_compare_file.
2013-03-22 13:54:46 +01:00
Jenkins for ownCloud
a766a44bcf
[tx-robot] updated from transifex
2013-03-22 12:08:57 +01:00
Cedric Bellegarde
8165b83a27
Check for service availability
2013-03-22 11:58:55 +01:00
Cedric Bellegarde
fa62c270e6
Merge git://github.com/owncloud/mirall
2013-03-22 11:40:58 +01:00
Cedric Bellegarde
c03199e78a
Re add space
2013-03-22 11:35:25 +01:00
Cedric Bellegarde
f346503534
Better fdo detection
2013-03-22 11:34:21 +01:00
Klaas Freitag
d43779671f
Added missing changelog 0.70.4.
2013-03-22 11:09:24 +01:00
Klaas Freitag
7b7ce3a43c
Remove versions table before new creation.
2013-03-22 11:04:04 +01:00
Klaas Freitag
3ce614039a
Added c_compare_file function and test - WIP.
2013-03-22 10:23:17 +01:00
Klaas Freitag
8b229f6413
Minor fixups.
2013-03-22 10:22:50 +01:00
Jenkins for ownCloud
287f1c55ff
[tx-robot] updated from transifex
2013-03-22 00:05:37 +01:00
Daniel Molkentin
1c6523bcec
Add plugin for screenreader support
2013-03-21 17:49:03 +03:00
Daniel Molkentin
337c6d3e4e
Try to avoid crash on Mac OS during setup
...
... by moving setupFavLink to a place only called
if the folder to be referenced exists for sure.
2013-03-21 12:50:47 +01:00
Jenkins for ownCloud
4a57957420
[tx-robot] updated from transifex
2013-03-21 00:05:23 +01:00
Klaas Freitag
19f07f9aea
Handle non statable files correctly, read missing info from db.
2013-03-20 21:56:09 +01:00
Klaas Freitag
945be9438c
Avoid variable name new to not confuse syntax highlighter.
2013-03-20 21:55:34 +01:00
Daniel Molkentin
c633302f31
Use the certificateChain() in the SSL error dialog
...
This includes the self-signed certificate anyway, and the previous
behavior led to funny side-effects.
2013-03-20 15:53:55 +01:00
Cedric Bellegarde
1315ca2a57
Move files to correct location
2013-03-20 10:19:55 +01:00
Cedric Bellegarde
2f0474a467
Add support for freedesktop notifications
2013-03-20 10:03:49 +01:00
Daniel Molkentin
abe53a8669
Do not define NDEBUG manually
2013-03-19 17:50:43 +01:00
Daniel Molkentin
db95e7291d
bump version
2013-03-19 16:30:17 +01:00
Klaas Freitag
b82c156c7e
Bump version to 0.70.5
2013-03-19 16:23:10 +01:00
Klaas Freitag
d117593fd1
Fix a const char warning.
2013-03-19 16:23:05 +01:00
Klaas Freitag
5a8d90cc25
Fix path handling in update routine.
2013-03-19 16:22:11 +01:00
Klaas Freitag
20816f346d
Fix a apple only warning.
2013-03-19 16:21:36 +01:00
Klaas Freitag
ae54c27805
Added office doc lock files.
2013-03-19 16:20:00 +01:00
Klaas Freitag
db70a3b2ae
Skip files which are not statable and ignore links and such.
2013-03-19 14:20:38 +01:00
Klaas Freitag
e3a4ec453c
Handle non statable files gracefully.
2013-03-19 14:20:03 +01:00
Klaas Freitag
f88e9baf15
Handle renames in read only shares correctly.
2013-03-19 14:18:34 +01:00
Andreas Schneider
df2a04b4ab
misc: Include stdio.h for snprintf.
2013-03-19 14:18:12 +01:00
Andreas Schneider
061fa6cc1b
misc: Correctly handle getenv().
...
The returned string of getenv() has an unknown size. You need to store
the result always in a char array with a certain size to make sure we
don't feed tainted data to the next function call.
2013-03-19 14:17:44 +01:00
Klaas Freitag
13c44ad25c
Skip files which are not statable and ignore links and such.
2013-03-19 14:02:12 +01:00
Andreas Schneider
ab70947755
propagate: Fix renaming in the propagation.
2013-03-19 13:56:20 +01:00
