Klaas Freitag
033fee6f53
Fix include path
2014-03-26 18:16:27 +01:00
Klaas Freitag
67ae541e2a
Safe use of c_strdup
2014-03-26 18:16:27 +01:00
Klaas Freitag
11bbad79e2
Use QTimer as object member rather than pointer based.
...
Avoid crashes if timer is zero.
2014-03-26 18:16:27 +01:00
Klaas Freitag
6e6f647c63
Change data type for fileId to QByteArray.
2014-03-26 18:12:22 +01:00
Klaas Freitag
c5100a789b
Collect data from the "other" tree for the treewalk functions.
...
This enables us to log all relevant information that were used
to decide on sync activity.
2014-03-26 18:12:22 +01:00
Olivier Goffart
2ad7b0aae0
Fix crash on first run when no account are configured
2014-03-26 17:42:05 +01:00
Olivier Goffart
588633a0f2
Fix leak: don't leak the settings
2014-03-26 17:42:05 +01:00
Markus Goetz
d5659442b2
SyncEngine: Sanity bail out if DB does not exist suddenly
...
The update/reconcile worked for me, but the Propagate step had an invalid DB
path but still went on (and then messed things up)
2014-03-26 16:57:50 +01:00
Markus Goetz
c6e5f39f7f
SyncJournalDb: Verbose log on load failure
2014-03-26 16:40:00 +01:00
Markus Goetz
7bef166d6c
CSync: Debug file_id on walk
2014-03-26 15:32:45 +01:00
Olivier Goffart
38344589c4
Exxtract the exception message from reply to PUT
...
Might be usefull to debug Internal Server Error
Fixes #1366
2014-03-26 12:02:22 +01:00
Olivier Goffart
98d7ff5116
Don't create .ctmp of sync journal
...
Fixes #1559
2014-03-26 10:25:50 +01:00
Denis Dzyubenko
6c28151e0f
Fast forwarded qtmacgoodies submodule
2014-03-26 10:15:35 +01:00
Daniel Molkentin
411cffd3d5
NSIS: libcrypto-10 dependency got lost somehow
2014-03-26 09:10:01 +01:00
Daniel Molkentin
1c4af687ea
Compile on Mac again
2014-03-26 07:20:24 +01:00
Mr. Jenkins
2de83b95e3
[tx-robot] updated from transifex
2014-03-26 01:26:42 -04:00
Daniel Molkentin
c3d37efa6c
Fix OS X compilation
2014-03-25 23:33:46 +01:00
Daniel Molkentin
7c7fad78f7
Qt5: QtLocation is not needed
2014-03-25 22:52:28 +01:00
Daniel Molkentin
3ac1849963
Don't moc twice
2014-03-25 20:55:04 +01:00
Olivier Goffart
b4f992b944
Merge pull request #1446 from owncloud/remove-tooltip
...
remove superfluous tooltip from server address input field
2014-03-25 20:16:26 +01:00
Daniel Molkentin
1c8e5ef4ee
Fix typo
2014-03-25 20:05:06 +01:00
Daniel Molkentin
45ec489f71
Merge branch 'master' of github.com:shadone/mirall into shadone-master
...
Conflicts:
cmake/modules/QtVersionAbstraction.cmake
src/CMakeLists.txt
src/mirall/owncloudgui.cpp
2014-03-25 19:56:45 +01:00
Daniel Molkentin
1b5e14fbc5
Update owncloudcmd docs
...
Fixes #1587
2014-03-25 19:04:05 +01:00
Daniel Molkentin
dddec8b250
-fPIC is implied on Windows
2014-03-25 19:04:05 +01:00
Daniel Molkentin
06082b585a
Add translations when using Qt5 as well
2014-03-25 19:04:05 +01:00
Daniel Molkentin
4bf0a2b188
NSIS: depend on Qt5-based installations
2014-03-25 19:04:05 +01:00
Daniel Molkentin
e2fe4972d9
Don't show ocsync version, it's part of mirall now
2014-03-25 19:04:05 +01:00
dragotin
efee9c689c
Merge pull request #1611 from Absolight/freebsd-port
...
Freebsd port - Thanks a lot!
2014-03-25 17:28:06 +01:00
Mathieu Arnold
84b4872938
And make it runnable on FreeBSD too.
...
Patch by: Tobias Berner
2014-03-25 17:23:11 +01:00
Mathieu Arnold
3f9bd1d72a
Fix build on FreeBSD.
...
We use libinotify, so the linux folderwatcher works.
Based on a patch by: Tobias Berner
2014-03-25 17:22:54 +01:00
Mr. Jenkins
1898e32b6a
[tx-robot] updated from transifex
2014-03-24 01:26:24 -04:00
Mr. Jenkins
9addd9bc27
[tx-robot] updated from transifex
2014-03-23 01:26:21 -04:00
Markus Goetz
91f416ffc7
Fix compile after changing Account::davPath()
2014-03-22 09:41:32 +01:00
Mr. Jenkins
28559ab657
[tx-robot] updated from transifex
2014-03-22 01:26:24 -04:00
Sandro Knauß
47274f1075
Merge remote-tracking branch 'respect-XDG_CONFIG_HOME' into 1.5
2014-03-21 17:20:15 +01:00
Markus Goetz
384eef4d6d
csync_owncloud: Add a debug message
2014-03-21 17:19:07 +01:00
Markus Goetz
ff95cbd04b
Account: Don't hardcode WebDAV path
2014-03-21 17:14:04 +01:00
Markus Goetz
cc5fabdab0
Engine: Introduce jobCompleted() signal
2014-03-21 17:13:02 +01:00
Markus Goetz
ff95e233bc
Token Credentials: Support actual tokens
2014-03-21 17:12:26 +01:00
Markus Goetz
f72e1cc837
Log: Don't override level for csync
...
The level shall be set from Folder or owncloudCmd only.
2014-03-21 13:52:35 +01:00
Olivier Goffart
8e6674e784
Merge branch '1.5'
...
Conflicts:
src/owncloudcmd/owncloudcmd.cpp
2014-03-21 10:06:45 +01:00
Olivier Goffart
8aace3284f
owncloudcmd: Fix an error during update phase would not terminate
...
the QApplication::quit() would be run before the exec() and would
be a noop, and then exec would just wait forever.
2014-03-21 10:03:11 +01:00
Olivier Goffart
922e004fc6
Make it an error instead of a crash when dav_connect fails.
...
Fixes #1591
2014-03-21 09:54:26 +01:00
Mr. Jenkins
2fc61479f7
[tx-robot] updated from transifex
2014-03-21 01:26:37 -04:00
Olivier Goffart
bb9d6b34c7
Remove FIXME and TODO
...
They are outdated
2014-03-20 16:42:43 +01:00
Olivier Goffart
07025c7432
Remove a FIXME
...
The commit message say that this line should be necessary to show
the information when the setting dialog is open, but this is working
now via the signals
2014-03-20 16:42:43 +01:00
Olivier Goffart
b65601aaa4
Remove FIXME
...
This has been refactored since the comment was added and is no longer a hack
2014-03-20 16:42:43 +01:00
Olivier Goffart
756e1c4a12
Prefer the use of _isDirectory over item._type == SyncFileItem::Directory
2014-03-20 16:42:42 +01:00
Olivier Goffart
c5f8a2555d
Rename _dir to _direction
...
(to avoid confusion with directory)
2014-03-20 16:42:42 +01:00
Olivier Goffart
a1ab9c84c7
Remove FIXME in syncengine
2014-03-20 16:42:42 +01:00
