Daniel Molkentin
2db17a57d2
Fix header names
2014-11-09 23:25:57 +01:00
Daniel Molkentin
a992c5b8d3
Fix build
2014-11-09 23:10:18 +01:00
Daniel Molkentin
269b59c2ba
More CMake adjustments
2014-11-09 22:58:24 +01:00
Daniel Molkentin
d57d3cf1f6
Drop Mirall from strings
2014-11-09 22:35:29 +01:00
Daniel Molkentin
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
Daniel Molkentin
f2eadacf09
Remove "Mirall" from class names
2014-11-09 22:30:29 +01:00
Daniel Molkentin
9ebc41ed6f
Remove "Mirall" from cmake project files
2014-11-09 22:30:05 +01:00
Olivier Goffart
7ae6712d56
Add a few Q_DECL_OVERRIDE
2014-11-08 11:21:48 +01:00
Olivier Goffart
98a283b4ec
Fix clang warnings
2014-11-08 11:21:48 +01:00
Olivier Goffart
d524f6b395
Fix compilation errors after merge
2014-11-08 11:11:05 +01:00
Olivier Goffart
6b716683e2
Merge the long PUT Poll URL feature with the new sql backend
2014-11-08 11:09:50 +01:00
Olivier Goffart
ba2c33af0b
Fix the il branch merge: Move the bandwidthmanager to libsync
2014-11-08 10:52:14 +01:00
Olivier Goffart
de11f602d5
Merge remote-tracking branch 'origin/il'
...
Conflicts:
csync/src/csync_private.h
src/CMakeLists.txt
src/gui/folder.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagator_qnam.cpp
src/libsync/propagator_qnam.h
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/mirall/syncjournaldb.cpp
2014-11-08 10:48:36 +01:00
Volkan Gezer
260c8e0227
fix typo
2014-11-07 17:51:15 +01:00
Daniel Molkentin
7c034b427e
Handle invalid handle & fix an issue found during code review
2014-11-07 14:52:31 +01:00
Daniel Molkentin
f25d175b5d
Merge remote-tracking branch 'origin/1.7'
2014-11-06 19:54:20 +01:00
Olivier Goffart
b70ecc3dd3
Never overwrite the mtime from the local file system in the db when updating the metadata
...
Attempt to fix #2431
2014-11-06 15:13:10 +01:00
Daniel Molkentin
89670e5ce4
Folderwatcher_win: handle conversion error
2014-11-06 12:54:33 +01:00
Christian Kamm
174e1acbc7
Folder::wipe(): Remove partial downloads and -shm,-wal db files.
2014-11-06 12:49:02 +01:00
Christian Kamm
1f09a24a72
Resync button: Remove partial downloads too. #2445
2014-11-06 12:17:04 +01:00
Christian Kamm
eed91ddf46
Legacy propagator: Don't use mtime retrieved via _fstat64.
...
May be the cause of #2431
2014-11-06 12:16:55 +01:00
Daniel Molkentin
96a7118d05
WiP: switch to ReadDirectoryChangesW
2014-11-06 12:04:33 +01:00
Klaas Freitag
6eec896282
FolderWatcher: Check for hidden outside of loop
2014-11-06 09:23:30 +01:00
Christian Kamm
a49a6bfd88
Logging: Report setModTime failures.
...
Ths may be helpful for #2252 and maybe even #2431 .
2014-11-05 13:20:19 +01:00
Christian Kamm
b87931c0a9
Logging: Print etags, not just result of comparison.
2014-11-05 13:08:53 +01:00
Christian Kamm
9b640d586b
Wizard: Fix local folder warning in advanced setup wizard. #2362
...
The _oldLocalFolder should always be the previously configured
folder, not the one that was most recently chosen on the wizard
page.
2014-11-05 12:10:41 +01:00
Christian Kamm
7440ffc0e6
Download: Fix data loss when rename fails. #2428
2014-11-05 11:00:46 +01:00
Markus Goetz
cf6219bb6f
NetworkJobs: Improve timeout handling and increase timeout by 5 sec
2014-10-30 11:54:58 +01:00
Christian Kamm
45eeb5065f
Download: Avoid overwriting file with case conflict. #1914
2014-10-30 09:06:53 +01:00
Klaas Freitag
ef16c409ef
Merge pull request #2393 from svkurowski/issue-2215
...
Switch monochrome systray icon color depending on systray brightness
2014-10-29 14:54:33 +01:00
Olivier Goffart
1eccfb798f
Add missing license headers
...
Part of #2068
2014-10-29 13:30:46 +01:00
Klaas Freitag
b9b9f3c136
Propagator: Schedule a resync immediately if file is modified during upload
2014-10-29 13:10:56 +01:00
Olivier Goffart
7810da51a8
Propagator: report error when deleting directories
...
Will help to understand why a directory cannot be removed
Will help for #2348
2014-10-29 12:23:48 +01:00
Christian Kamm
4e20a02fe5
SyncJournalDB: Add filesize column to metadata.
...
* Alter table to include column.
* Make get/set in SyncJournalDB store and load it.
* Make csync recover the stat_t's size member from it.
2014-10-29 09:53:36 +01:00
Markus Goetz
7bad731ad2
CheckServerJob: Guard again null reply
...
Lucia had reported a crash in this function
2014-10-29 09:38:20 +01:00
Daniel Molkentin
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
Markus Goetz
782463589e
ownSql: Also mention filename
2014-10-28 21:50:09 +01:00
Markus Goetz
ff570c4a6b
ownSql: Don't set busy timeout on bad object
2014-10-28 21:46:30 +01:00
Klaas Freitag
105ff694f2
SyncEngine: Handle 503 condition as soft error to properly handle etags.
...
Otherwise the ETags could be removed from the db and cause file
deletes.
2014-10-28 17:13:21 +01:00
Olivier Goffart
5723abe6eb
Merge remote-tracking branch 'origin/fix_service_unavailable' into 1.7
2014-10-27 20:49:46 +01:00
Klaas Freitag
0692fea9d8
discovery: handle 503 reply code from server for directories
...
503 for directories means that the dir is a mounted directory from an
external mount which currently is not available. The directory is
ignored and not traversed into during discovery phase.
2014-10-27 19:21:12 +01:00
Markus Goetz
b0882a5cd2
Fix compile
2014-10-27 17:18:49 +01:00
Markus Goetz
4c1a0005e6
Make two more asserts usable in nondebug
2014-10-27 16:01:18 +01:00
Markus Goetz
05ceed926c
SyncEngine: Log for an assert, return -1 for nondebug compile
2014-10-27 15:52:17 +01:00
Olivier Goffart
ce300d88ee
Wizard: show the choice to start a clean sync if the directory exist even on new accounts
...
Task #2406
2014-10-27 13:05:17 +01:00
Brandon Coleman
05c0249672
correct spelling on user is empty error.
2014-10-27 07:59:31 -04:00
Brandon Coleman
2498c13078
options are required at the beginning of owncloudcmd.
...
Conflicts:
src/owncloudcmd/owncloudcmd.cpp
2014-10-27 07:59:31 -04:00
Olivier Goffart
cddad94e45
Selective Sync: change the label text
...
to specify that the files will be removed from the local folder
Task #2404
2014-10-27 11:33:25 +01:00
Brandon Coleman
ece1100d65
options are required at the beginning of owncloudcmd.
2014-10-26 15:33:50 -05:00
Brandon Coleman
e5b03634ae
correct spelling on user is empty error.
2014-10-25 11:01:58 -05:00
