Daniel Molkentin
37d6f6eeab
Build on OS X
2013-11-25 10:54:18 +01:00
Klaas Freitag
fd1552f7a0
Handle SoftError and show blacklisted files.
2013-11-24 22:27:11 +01:00
Klaas Freitag
055a8d7e74
Do not display error messages if user aborts the sync run.
2013-11-24 22:26:50 +01:00
Klaas Freitag
1964e60eb0
Do not show an error message if user aborted. Also CSYNC_STATUS fixes.
2013-11-24 22:21:29 +01:00
Klaas Freitag
11acfde55a
Refresh the Protocol widget when the dialog is raised.
2013-11-24 22:20:43 +01:00
Klaas Freitag
b6eae58a2c
Only set the error code to a generic one if it is still ok.
2013-11-24 22:18:08 +01:00
Klaas Freitag
cc6c5e0db5
Let function csync_get_status return the CSYNC_STATUS
...
In original csync, csync_get_status() returned the status variable from
the context, which indicated in which state the sync run currently is,
which is never used.
What we expected in our mirall code however is the CSYNC_STATUS as
detailed result of a certain operation. Changed the function to reflect
that, even if that is an evil API change.
2013-11-24 22:17:36 +01:00
Mr. Jenkins
3a1c6429ab
[tx-robot] updated from transifex
2013-11-23 23:14:03 -05:00
Klaas Freitag
ecb2444923
Handle changing source file in upload correctly.
...
Delete the file on the server if the source file is new, but
the source did not arrive completely within a timespan.
2013-11-22 19:45:26 +01:00
Klaas Freitag
65bd4be16e
Make sure all queries are initialized on our database object.
...
Since we use a database with the non default name, we need to do that,
otherwise the query is initialized on the default db which is not open
in our case.
2013-11-22 15:37:35 +01:00
Mr. Jenkins
39e48d3d01
[tx-robot] updated from transifex
2013-11-21 20:06:22 -05:00
Klaas Freitag
0327461c25
Remove unneeded dlfcn header.
2013-11-21 14:13:35 +01:00
Mr. Jenkins
c0b3672f32
[tx-robot] updated from transifex
2013-11-21 08:09:18 -05:00
Klaas Freitag
8d2950f66c
Enable the overall file count in progress again.
2013-11-21 11:37:47 +01:00
Klaas Freitag
55e82ee4c1
Made transaction management a bit more transparent. Some fixes.
2013-11-21 11:13:58 +01:00
Klaas Freitag
aa17be40cc
Some database code cleanups.
2013-11-20 18:19:14 +01:00
Tom Swartz
32e205f6ce
Add exclusion for OSX ._<filename> files
...
Exclude older OSX metadata ._<filename> files from sync, improving
cross-platform sync experience.
Tested-on: arcturus <20 Nov 2013>
2013-11-20 10:26:36 -05:00
Klaas Freitag
97c661c909
Cleanups
2013-11-20 14:59:58 +01:00
Klaas Freitag
2767e7084a
Minor cleanups.
2013-11-20 14:27:44 +01:00
Klaas Freitag
5900b1ad25
Add blacklisting for files with error conditions.
2013-11-20 14:27:44 +01:00
Klaas Freitag
20b9ae757d
Add a http status code varialbe to the sync item object.
2013-11-20 14:27:44 +01:00
Klaas Freitag
aff2dd9f44
The IGNORE statement is handled further down the code.
2013-11-20 14:27:44 +01:00
Klaas Freitag
e30c484a7a
Ignore the SIGPIPE signal as that disturbs debugging with Qt Creator.
...
It is questionable why this happens and if this patch really helps,
or if it might have side effects. Input appreciated :)
2013-11-20 14:27:44 +01:00
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
