Klaas Freitag
a1286cc684
Add Content-Type header to http PUT request.
...
This hopefully fixes bug #1124 as it satisfies the mod_security
settings.
2013-11-15 16:15:26 +01:00
Markus Goetz
4194a078d5
Revert "set utf8 for the central settings file"
...
This reverts commit 6758c89130
2013-11-15 15:45:21 +01:00
Daniel Molkentin
6758c89130
set utf8 for the central settings file
2013-11-15 14:43:48 +01:00
Olivier Goffart
c15a1eedd1
Only update the db for ETAG if the etag has changed for directories
2013-11-15 13:53:18 +01:00
Olivier Goffart
79bf778a42
Forward the should_update_etag to the tree visitor
2013-11-15 13:52:41 +01:00
Olivier Goffart
0c689c4cca
Make sure that if two items have the same inodes, they are on the same type.
...
We don't want to rename a file to a directory
2013-11-15 12:32:05 +01:00
Olivier Goffart
dd24950881
Allow t3.pl to pass with owncloud5
...
Which do not have fileid
2013-11-15 12:23:05 +01:00
Klaas Freitag
bf6e1f10ce
Prepare the queries after the database was migrated.
2013-11-15 11:21:27 +01:00
Klaas Freitag
c22f8a47f1
Initialise values properly, avoid warning.
2013-11-15 10:32:13 +01:00
Klaas Freitag
858facb5e0
Use precompiled database statements.
2013-11-15 10:32:13 +01:00
Olivier Goffart
b610dd2754
Revert "Partial revert of "CMake: Remove cmake module""
...
That patch reverted the oposite of what it should have reverted :-)
This reverts commit b22ef9f8fa
2013-11-15 10:20:12 +01:00
Olivier Goffart
b3972a5ba8
Do not fetch the file id in the propagator with a HEAD
...
Normally, the fileid comes with the PUT or the GET.
If it did not comes with the PUT, it means the server do not support
fileid, we should not query it with a useless HEAD.
Also, in case the fileid changes (which it should not) update anyway
to the new fileid in the db
2013-11-15 10:18:19 +01:00
Klaas Freitag
0993289180
Check the remote file Id of files in moved directories.
2013-11-15 09:36:33 +01:00
Klaas Freitag
32533a18af
Added function to retrieve file ID from remote.
2013-11-15 09:36:33 +01:00
Daniel Molkentin
36e8273da0
fix mac builds
2013-11-14 20:53:56 +01:00
Daniel Molkentin
2f4de3cc48
Build fix
2013-11-14 20:41:23 +01:00
Daniel Molkentin
b22ef9f8fa
Partial revert of "CMake: Remove cmake module"
...
This reverts commit 63188667bb
2013-11-14 19:34:12 +01:00
Daniel Molkentin
e20f39f040
Another cleanup
2013-11-14 19:31:38 +01:00
Daniel Molkentin
63188667bb
CMake: Remove cmake module
2013-11-14 19:26:09 +01:00
Daniel Molkentin
c2eaf5e627
owncloud is no longer a dl'opened module, but linked into csync
2013-11-14 19:22:22 +01:00
Daniel Molkentin
7ba8983f0a
Change all Network Jobs to use start()
2013-11-14 19:20:19 +01:00
Markus Goetz
088aa6ebdd
Wizard: Default button to Next
2013-11-14 19:13:59 +01:00
Olivier Goffart
8a3e617630
Don't put csync_owncloud in a plugin.
...
It is now statically linked
2013-11-14 18:58:28 +01:00
Olivier Goffart
7e7853f170
Fix t1.pl
...
Previous commit had the wrong regexp
2013-11-14 18:58:28 +01:00
Olivier Goffart
e0fdad93f4
t4.pl'
2013-11-14 18:20:57 +01:00
Olivier Goffart
415b51b2b5
Some more checks in t1.pl
...
Notably that the conflict file actually exists. (There was not even a
conflict before because the filename of the touch was wrong)
2013-11-14 18:03:50 +01:00
Markus Goetz
767ec4ed59
Wizard: Support redirects again
2013-11-14 17:54:38 +01:00
Markus Goetz
b12b8c981d
Wizard: Also reset timeout on forwards
2013-11-14 17:23:56 +01:00
Markus Goetz
b499a62593
Wizard: Timeout handling for CheckServerJob
2013-11-14 17:23:56 +01:00
Markus Goetz
fa0a2764a4
Fix changing URL in wizard
2013-11-14 17:23:56 +01:00
Markus Goetz
a537a98f03
Tray menu: Populate at start
2013-11-14 17:23:56 +01:00
Olivier Goffart
4eb19000a4
Differentiate the RENAME and EVAL_RENAME
...
EVAL_RENAME is set at the update phase and means that this is the destination of
a file that has been renamed.
RENAME is set for the file that need to be renamed.
Before, we knew the difference because of which remote the instruction was
but now we need to make the distinction explicit
2013-11-14 17:08:42 +01:00
Klaas Freitag
bef7c3c48e
Fixes to t3.pl, added some assertions.
2013-11-14 17:06:53 +01:00
Klaas Freitag
e40370f67a
Use printInfo method in t3.pl
2013-11-14 16:10:41 +01:00
Sven Strickroth
ed5b0973dd
Do not create folder for single link
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-14 15:45:14 +01:00
Olivier Goffart
e8e27b61f6
Revert the changes that fetch the file id in the propagator.
...
We don't want to fetch the file id in the propagator.
Revert "Put item member variable to base class."
This reverts commit f7aa2aa348ccd254abba
2013-11-14 14:59:03 +01:00
Olivier Goffart
11a131fa90
csync_statedb_query: Allow null fields in the database
...
The fileid defaults to null for old database.
Since commit 4b8f2a287f
2013-11-14 14:41:36 +01:00
Sven Strickroth
336e22233d
Do not create uninstall shortcut in start menu
...
According to Microsoft Design guidelines (http://msdn.microsoft.com/en-us/library/windows/desktop/aa511447.aspx ) no icons for uninstallers should be created.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-14 14:40:21 +01:00
Daniel Molkentin
578431c791
Fix building owncloudcmd in case of theming
2013-11-14 14:20:09 +01:00
Olivier Goffart
4d146e87d1
Remove INVALID_FILE_ID and consider empty file id as invalid
2013-11-14 13:43:26 +01:00
Olivier Goffart
b518adc203
Don't read from the db if the file id has changed.
...
File id may change when upgrading to owncloud 6 or when upgrading to mirall 1.5
This also changes the location where we check if we need to read from
the DB. Instead of doing it from csync_ftw, we do it from
_csync_detect_update. In that function we know the etag and the file id.
Which mean we change the flag before the recursive call to csync_ftw instead
of in the begin of the function. Therefore, we need to restore the flag
after calling the function to the previously saved state.
2013-11-14 13:43:26 +01:00
Klaas Freitag
6b0b7d1b90
make t1.pl work again.
2013-11-14 13:07:55 +01:00
Daniel Molkentin
ead0f8d029
Update build docs
2013-11-14 12:36:09 +01:00
Klaas Freitag
f7aa2aa348
Put item member variable to base class.
2013-11-14 11:37:32 +01:00
Klaas Freitag
ccd254abba
Add isValidFileId and getFileIdPropget methods.
2013-11-14 11:37:08 +01:00
Klaas Freitag
4b8f2a287f
Retrieve file_id together with etag from db if read from db.
2013-11-14 11:32:03 +01:00
Klaas Freitag
3cc2593f62
Handle invalid file_id correctly.
2013-11-14 11:31:30 +01:00
Klaas Freitag
c3e154b2e6
Do not overwrite with an invalid file_id.
2013-11-14 11:30:51 +01:00
Daniel Molkentin
56de183155
Merge pull request #1160 from csware/exclude-office-tempfiles
...
Add another Office lock/temporary file pattern
2013-11-13 15:52:37 -08:00
Daniel Molkentin
c8256eea0e
Merge pull request #1162 from csware/startmenu-according-to-ms-guidelines
...
Startmenu according to ms guidelines
2013-11-13 15:52:05 -08:00
