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 |
|
Markus Goetz
|
d33b68ccc9
|
CSync: Error out if DB error
|
2014-10-20 19:32:06 +02:00 |
|
Olivier Goffart
|
7e898cf60c
|
SelectiveSync: rename blacklist to selectiveSyncBlackList in some places
Issue #2301
|
2014-10-11 16:24:45 +02:00 |
|
Olivier Goffart
|
1cd5681967
|
permissions: Remember the permissions for the root folder
|
2014-09-19 10:58:52 +02:00 |
|
Olivier Goffart
|
d4bbd28757
|
csync: remove ignored_cleanup: it's not used anymore
|
2014-08-28 17:16:51 +02:00 |
|
Olivier Goffart
|
98b7248df0
|
reconcile/update: don't remove directory that contains ignored files
|
2014-08-28 17:16:17 +02:00 |
|
Olivier Goffart
|
936252765a
|
Merge branch 'master' into selective_sync
Conflicts:
src/mirall/syncengine.cpp
src/mirall/syncengine.h
|
2014-08-18 14:44:43 +02:00 |
|
Markus Goetz
|
ce2741cebc
|
SyncEngine & UI: Progress notifications for update phase
For each directory (local and remote, we have UI update throtting code)
a signal is emitted.
It is used by the settings dialog and the tray menu.
|
2014-08-15 15:28:35 +02:00 |
|
Olivier Goffart
|
c1831f4946
|
Selective sync: use a black list instead of a white list
|
2014-08-15 12:29:10 +02:00 |
|
Olivier Goffart
|
7e009667a2
|
Selective sync: ignore the files that are not in the selective sync white list
|
2014-08-11 18:42:24 +02:00 |
|
Markus Goetz
|
319cf76417
|
CSync: Move compiler ifdef outwards
|
2014-06-16 16:26:00 +02:00 |
|
Markus Goetz
|
70ff928381
|
CSync & statedb: Parse 'perm' from server
ownCloud 6 sends this.
|
2014-06-06 15:24:17 +02:00 |
|
Markus Goetz
|
b48ab79a92
|
CSync & statedb: Remove uid/gid
Columns are still in the DB as we don't want to break any compatibility.
|
2014-06-06 13:41:16 +02:00 |
|
Markus Goetz
|
233450d850
|
CSync: Remove config dir setting
|
2014-06-04 10:56:56 +02:00 |
|
Olivier Goffart
|
806ab8ea46
|
csync: remove the local mode
It is no longer used for a long time
|
2014-06-03 17:52:07 +02:00 |
|
Markus Goetz
|
4d4eab8b1c
|
CSync & Propagator: Support a direct download URL
This is for server file backends that support sending a
direct URL.
|
2014-06-03 14:55:34 +02:00 |
|
Markus Goetz
|
4d4ae9374b
|
CSync: Remove old defines
|
2014-06-03 11:51:12 +02:00 |
|
Markus Goetz
|
8a55f831f4
|
CSync: Use context instead of global variable
|
2014-06-03 11:51:12 +02:00 |
|
Olivier Goffart
|
9da261acd8
|
Do not read from the database when upgrading from 1.5
We need to make sure that the file id are updated (if the user
had upgraded from owncloud 5 to owncloud 6 while using owncloud 1.5)
|
2014-04-25 13:31:44 +02:00 |
|
Olivier Goffart
|
8de9bec122
|
Remove progress info from csync
csync doesn't do no propagation no more
|
2014-03-28 10:50:15 +01:00 |
|
Klaas Freitag
|
033fee6f53
|
Fix include path
|
2014-03-26 18:16:27 +01:00 |
|
Klaas Freitag
|
c3cee3426e
|
Improved database access code for csync.
- Use precompiled database statements
- Store them in the csync context struct
- Hand whole context as parameter to db access functions
|
2014-03-20 11:15:28 +01:00 |
|
Markus Goetz
|
1c8f279214
|
csync: Remove more vio abstraction
|
2014-02-28 09:13:40 +01:00 |
|
Markus Goetz
|
e7fb84a491
|
csync: Remove capabilities
|
2014-02-27 13:42:20 +01:00 |
|
Markus Goetz
|
a652fec5a0
|
csync: Remove more unused stuff
|
2014-02-27 13:33:22 +01:00 |
|
Olivier Goffart
|
c7227297af
|
Make it compile with the merge of csync mirall
|
2014-01-15 12:20:03 +01:00 |
|
Olivier Goffart
|
bf7ca60bec
|
Move csync in order to merge it with mirall
|
2014-01-13 14:39:50 +01:00 |
|