Klaas Freitag
7b8dc9777e
Sync: Rename ignored file member to _serverHasIgnoredFiles.
...
This should make it more obvious that only the server state about
ignored files is stored in the db.
2015-07-15 15:51:15 +02:00
Klaas Freitag
b0aedef4b0
Sync: Store information about ignored files on the server in database.
...
That allows better handling of remove requests that should not be done
because the directory is not empty on the remote side (as it contains
ignored files).
2015-07-15 15:49:27 +02:00
Klaas Freitag
02a5a8ea3b
SyncJournal: Use proper long path handling.
2015-07-08 18:13:40 +02:00
Olivier Goffart
1b9d82679c
OwnSQL: fix initialisation of variables
2015-06-08 15:30:39 +02:00
Christian Kamm
91fce3ea73
Make public API explicit about blacklist kind. #2301
...
'blacklist' can mean the selective sync blacklist or the error
blacklist. Names in public API are now explicit about which
blacklist is meant.
2015-01-16 10:17:19 +01:00
Daniel Molkentin
281c0e1553
Merge branch 'master' into rename_client
...
Conflicts:
CMakeLists.txt
src/gui/main.cpp
src/libsync/accessmanager.cpp
src/libsync/accessmanager.h
src/libsync/owncloudpropagator_p.h
2014-11-12 00:07:59 +01:00
Daniel Molkentin
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
Olivier Goffart
98a283b4ec
Fix clang warnings
2014-11-08 11:21: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
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
Christian Kamm
a20375372d
Blacklist: Don't ignore error files forever. #2247
...
Instead try them again regularly, but don't show the user any
error messages if the error persists.
2014-10-22 12:25:18 +02:00
Daniel Molkentin
4fc044d368
Merge branch 'master' into move_lib_to_sep_dir
...
Conflicts:
cmake/modules/NSIS.template.in
src/CMakeLists.txt
src/creds/shibboleth/authenticationdialog.cpp
src/creds/shibboleth/authenticationdialog.h
src/gui/owncloudgui.cpp
src/libsync/creds/shibboleth/authenticationdialog.cpp
src/libsync/creds/shibboleth/authenticationdialog.h
src/libsync/mirallaccessmanager.cpp
src/mirall/authenticationdialog.cpp
src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02:00
Daniel Molkentin
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
