Klaas Freitag
0f6dd8748f
Fixed some header wording.
2013-11-20 14:27:44 +01:00
Klaas Freitag
a342f63fdf
Changed wording: Replaced Protocol against Status.
2013-11-20 14:27:44 +01:00
Daniel Molkentin
5c4d240c66
Build on mac with Qt 5
...
I still had this patch on disk.
2013-11-19 14:41:40 +01:00
Markus Goetz
e551e92e13
Downloads: Ignore file if no ETag was sent
...
Fixes part of #970
2013-11-19 12:44:25 +01:00
Markus Goetz
b98d97a96d
SyncJournalDb: Fix warnings
...
I got those warnings for the latter sync runs:
11-19 10:58:15:997 QSqlDatabasePrivate::removeDatabase: connection 'qt_sql_default_connection' is still in use, all queries will cease to work.
11-19 10:58:15:997 QSqlDatabasePrivate::addDatabase: duplicate connection name 'qt_sql_default_connection', old connection removed.
2013-11-19 11:28:08 +01:00
Klaas Freitag
f30ac49264
Cached more queries, used safe QSqlQuery pattern
2013-11-18 13:02:09 +01:00
Klaas Freitag
49ba252fff
Database initialize code cleanup.
...
If the QSqlQuery class is called with a query in the constructor, the query
is executed immediately. In fact, we executed each query twice before.
Later on we might want to implement a wrapper clas around the query.
2013-11-18 10:02:33 +01:00
Klaas Freitag
69269f8f75
Use transactions to speed up database access.
2013-11-18 10:02:32 +01:00
Klaas Freitag
e73730cb94
Close database after retrieval of file record count.
...
As the csync updater opens the database itself, it is cleaner to close
the db before and open it again after csync has finished.
Added a close method to the journal class.
2013-11-18 10:02:32 +01:00
Klaas Freitag
098e04c13f
Set PRAGMA synchronous to NORMAL
2013-11-18 10:02:32 +01:00
Klaas Freitag
b0f6628584
Moved implementation of start() to cpp file.
2013-11-18 10:02:32 +01:00
Klaas Freitag
42f6867329
Add some useful logging.
2013-11-18 10:02:32 +01:00
Daniel Molkentin
0a9a3d8f04
Cleanup in folderman
2013-11-18 09:37:09 +01:00
Daniel Molkentin
ec850e83b9
Folders need to be setup before initializing the GUI
...
This fixes the incomplete context menu
2013-11-18 09:37:09 +01:00
Markus Goetz
08665d6ac2
Settings: Don't specify encoding
...
QSettings automatically does escaping. When UTF-8 was set, I
got all kind of problems with the QByteArray for the geometry
and the umlaut in my name for the proxy user.
2013-11-18 09:30:42 +01:00
Klaas Freitag
61f08cdd97
Removed some unneeded code.
2013-11-15 16:22:41 +01:00
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