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
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
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
Klaas Freitag
e4966ec9d1
Added documentation about owncloudcmd.
2014-03-20 16:35:43 +01:00
Olivier Goffart
23f3a6b319
restore the last change menu
...
It was not yet implemented after the progress refactoring
2014-03-20 14:43:10 +01:00
Olivier Goffart
ebeb668a62
QNAM jobs: Make sure there is an etag is proper and not changed when one resume
...
Those tests are existing on the legacy jobs.
We check there is an etag so we make sure a proxy is not in between.
(We have seen user complaining because their proxy is replacing the
pages with one that says they need to enter their login and password)
Also it is important to check that the etag has not changed if we resume
(this may happen if the file is changed on the server between the update
phase and the propagate phase, and that we resume this file)
2014-03-20 13:31:42 +01:00
Klaas Freitag
d2e1923694
Fix compile warning.
2014-03-20 12:57:57 +01:00
Klaas Freitag
a5ede054d6
Fix statedb tests.
2014-03-20 12:35:16 +01:00
Klaas Freitag
ba2ff4ec46
Copy test database into the build tree.
2014-03-20 12:35:16 +01:00
Klaas Freitag
ca536f467a
Proper initialization to avoid build warnings.
2014-03-20 12:35:16 +01:00
Olivier Goffart
05d3273591
Detect the error that may happen when downloading a file
2014-03-20 11:35:30 +01:00
Klaas Freitag
39924d79cb
Add new test to test the csync database code.
2014-03-20 11:15:28 +01:00
Klaas Freitag
f7866aabde
Add C++ extern "C"
2014-03-20 11:15:28 +01:00
Klaas Freitag
eb59f98ec9
Fix quoting of query by text.
2014-03-20 11:15:28 +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
Klaas Freitag
f21dd05c2d
Streamline logging.
2014-03-20 11:15:28 +01:00
Klaas Freitag
6005b9c16e
Remove some superflous logging.
2014-03-20 11:15:28 +01:00
Mr. Jenkins
77bf37c6f6
[tx-robot] updated from transifex
2014-03-20 01:26:23 -04:00
Mr. Jenkins
8e133dc8ea
[tx-robot] updated from transifex
2014-03-19 01:26:24 -04:00
Daniel Molkentin
d10aec6055
NSIS: Install owncloudcmd on Windows
2014-03-18 23:56:50 +01:00
Klaas Freitag
9d1208baa4
Also allow http and https protocols.
2014-03-18 17:10:03 +01:00
Klaas Freitag
8e914deb99
Revert "Do not rely on the url scheme owncloud(s) any more."
...
This reverts commit 34dd3b207e
2014-03-18 16:57:01 +01:00
Klaas Freitag
34dd3b207e
Do not rely on the url scheme owncloud(s) any more.
...
If it is not owncloud or ownclouds, rely on the scheme
that was given by the user.
2014-03-18 14:16:50 +01:00
Klaas Freitag
68e8d659fb
Remove unused code.
2014-03-18 14:16:06 +01:00
Mr. Jenkins
f79765a536
[tx-robot] updated from transifex
2014-03-18 01:26:28 -04:00
