Klaas Freitag
c6a926842a
Fix recursivley flag misinterpretation.
2013-11-05 17:47:51 +01:00
Daniel Molkentin
440b5164ad
Build fix
2013-11-04 16:41:59 +01:00
Daniel Molkentin
cc5f17a7d2
Merge remote-tracking branch 'origin/master' into account_refactoring
...
Conflicts:
src/mirall/accountsettings.cpp
src/mirall/folder.cpp
2013-11-04 16:38:55 +01:00
Daniel Molkentin
85d5b82811
- Make saving/restoring accounts work.
...
- Prepare for fetching quota
2013-11-04 16:36:23 +01:00
Klaas Freitag
7b99d02875
Change order of the local assert of directories.
2013-11-04 14:55:17 +01:00
Olivier Goffart
f0a1ac4346
Fix syncing folder with nothing in it
...
Do the start after connecting, as the finish may be imediate if there
is nothing to do.
2013-10-31 12:11:56 +01:00
Olivier Goffart
bdc39f9cc2
Allow folder that are prefix of another
2013-10-31 11:41:56 +01:00
Olivier Goffart
d3ae2f42a7
Reset the proxy module property at every sync
...
This is required for the fix for #713
Since the module properties are shared in global variables shared by
every folders, removing another folder may clean the proxy settings.
So we need to restore them at every sync
2013-10-31 11:39:43 +01:00
Olivier Goffart
1a6a6758d3
We need to restore the read_from_db flag AFTER closedir
...
Else, we might dispatch to the wrong close call (the one from owncloud
instead of the one from the db, resulting in a memory leak
2013-10-31 11:38:00 +01:00
Olivier Goffart
f5391def6b
Don't cleanup in owncloud's vio_module_shutdown
...
All the cleanup is done in owncloud_commit which should
necessarily be called.
Should fix https://github.com/owncloud/mirall/issues/713
The problem was that csync_destroy was called on another csync
instance in another thread, resulting in a crash
Yes, there is still a problem with the proxy settings.
2013-10-31 11:38:00 +01:00
Olivier Goffart
0a99aa5fc7
Don't forget to close the database.
...
The code was removed when the code to write the database was removed.
But we still need to close the database
2013-10-31 11:14:21 +01:00
Olivier Goffart
df39ab0b2f
Don't leak the system tray
2013-10-31 10:52:19 +01:00
Olivier Goffart
28833ee5ac
Fix crash when removing folder while syncing.
...
We need to set _thread to 0 after destoying it
2013-10-31 10:51:45 +01:00
Olivier Goffart
c9cfa16929
Fix memory leak by properly cleaning memory in csync_commit
...
Restore two lines that were losts in the big merge from csync master
(b5ed352aa3
2013-10-31 10:05:15 +01:00
Olivier Goffart
8c4ecb4fba
Only use etag to know if we should use the db or not
...
Null file id might just mean the server don't support file id.
So use the database even if fileid is null
2013-10-31 10:02:20 +01:00
Klaas Freitag
c66a1d1895
Removed unused code from LocalRename
2013-10-30 18:14:33 +01:00
Klaas Freitag
cdee0dc1cf
Added a PropagateLocalRename job to do local renames.
2013-10-30 17:37:34 +01:00
Klaas Freitag
a43c5fcfe8
Fix header name according to changes on server master.
2013-10-30 17:37:34 +01:00
Klaas Freitag
0b5f1e6dd2
Make tests compile without propagate code.
2013-10-30 17:35:25 +01:00
Klaas Freitag
17d5e67d96
Handle remote renames better.
2013-10-30 17:34:40 +01:00
Klaas Freitag
4412ec38e4
Properly check if the file type has changed.
2013-10-30 17:34:40 +01:00
Klaas Freitag
70b6a5a8b1
Adjust header name to latest server implementation.
2013-10-30 17:34:40 +01:00
Olivier Goffart
5c67f39476
Ignore error 404 on DELETE
...
This may happen if we have stale entries in the database
2013-10-30 17:33:06 +01:00
Olivier Goffart
fb47657b1f
Make F6 in the account config sync the selected folder, for debugging purposes
...
Issue #409
2013-10-30 16:58:08 +01:00
Olivier Goffart
76d46af4b7
Revert "Implement a sync now button"
...
Actually, after discussion with the team, we decided this button is a bad idea
This reverts commit b56fcd8ebd
2013-10-30 16:48:28 +01:00
Daniel Molkentin
86af2848dd
Merge remote-tracking branch 'origin/master' into account_refactoring
...
Conflicts:
src/mirall/accountsettings.cpp
2013-10-30 16:37:49 +01:00
Daniel Molkentin
4ca310b63b
Remove ownCloudInfo for good
2013-10-30 16:33:15 +01:00
Daniel Molkentin
59bc1d8966
Credential Store is no longer static
...
It now belongs to HttpCredentials
2013-10-30 16:32:34 +01:00
Daniel Molkentin
14c2ff44f3
More porting to Account class
...
- Finish port of owncloud setup wizard to Account
- Deprive MirallConfigFile of the customHandle
2013-10-30 16:31:47 +01:00
Olivier Goffart
b56fcd8ebd
Implement a sync now button
...
The button is in the account config, next to the "pause/resume" button
Fixes #409
2013-10-30 16:27:00 +01:00
Olivier Goffart
e38d6d974b
Replace _Button* with _button
...
Identifiers starting with underscore and uppercase are reserved in C++.
2013-10-30 15:52:30 +01:00
Olivier Goffart
9500c5ffab
Do not change the instruction anymore when we finish an item
...
The status is in the status. Keep the original instruction so the
UI knows what to display for eath item
2013-10-30 10:46:05 +01:00
Olivier Goffart
b079cedbf5
Use the status instead of the instruction for finished items
2013-10-30 10:44:41 +01:00
Olivier Goffart
a70e51f690
Fix t1.pl since the argument of owncloudcmd have changed
2013-10-29 13:47:08 +01:00
Olivier Goffart
f707dc1a8b
remove propagate function from csync_owncloud
2013-10-29 13:47:08 +01:00
Olivier Goffart
ae2b2c8cf8
Remove the other modules than owncloud
...
Only owncloud is supported now
2013-10-29 13:23:28 +01:00
Olivier Goffart
176daa7d96
Remove the propagate step.
...
Since the writing of the database has been removed, the propagate
step might as well be removed as it is performed by mirall.
2013-10-29 13:17:44 +01:00
Olivier Goffart
6e088e28f5
Adjust the mtime in case of fake conflicts
...
"Fake conflicts" happen when the etag changes on the server, and the
mtime changes on the client, but the actual file is still exactly
the same. We correctly detect them as false conflict and we do not
generate the conflict file for them.
But we should also update the local mtime to the server mtime so future
sync don't get confused.
2013-10-29 12:23:51 +01:00
Olivier Goffart
a11ecad41a
Mark false conflict as UPDATED so we save their entry in the database
2013-10-29 12:14:51 +01:00
Olivier Goffart
01e2743bae
Always download the conflicted files.
...
Conflicts have a direction==NONE. And they need to be downloaded, not uploaded
2013-10-29 12:13:30 +01:00
Olivier Goffart
75ffa787a6
emit the EndDownload progress at the right place.
...
It was put in rename instead of download
2013-10-29 12:13:30 +01:00
Olivier Goffart
4ad9f34807
Save the UPDATED files in the database
...
Those are files that were detected as "resolved conflict".
They should have been a conflict because they both were new, or both
had their local mtime or remote etag modified, but the size and mtime
is the same on the server. This typically happen when the database is removed.
Nothing will be done for those file, but we still need to update the database.
2013-10-29 12:13:30 +01:00
Daniel Molkentin
a91799a11c
Make the setup wizard compile again
...
- introduces more jobs
- needs more cleaning up
2013-10-28 20:01:59 +01:00
Daniel Molkentin
44fd03c058
Merge pull request #1125 from iAndre89/patch-1
...
Update mingw32-cross-nsis-plugin-processes and mingw32-cross-nsis-plugin...
2013-10-28 09:20:09 -07:00
Andrea Sosso
083e75998f
Update mingw32-cross-nsis-plugin-processes and mingw32-cross-nsis-plugin-uac
2013-10-28 17:17:10 +01:00
Olivier Goffart
adc47948a5
Add a comment explaining OwncloudPropagator::start
2013-10-28 17:00:27 +01:00
Olivier Goffart
6e886e28e9
Merge branch 'propagator-job'
...
Conflicts:
src/mirall/owncloudpropagator.cpp
2013-10-28 16:26:25 +01:00
Klaas Freitag
e63fc184a5
Options parsing added.
2013-10-28 16:07:13 +01:00
Olivier Goffart
84a40dcb59
Refactor the new propagator in jobs
...
This makes the code (IMHO) more easy to understand, and will allow
even more easy parallelism
2013-10-28 15:58:35 +01:00
Olivier Goffart
8e90782107
Make owncloudcmd display the debug output
2013-10-28 15:45:37 +01:00
