Daniel Molkentin
68afc6011d
proxy dialog: no extra heading
2013-02-14 17:36:11 +01:00
Daniel Molkentin
524ffcd0e1
owncloud setup: Fix label style
2013-02-14 17:36:11 +01:00
Jenkins for ownCloud
a7303205b4
[tx-robot] updated from transifex
2013-02-14 00:08:08 +01:00
Olivier Goffart
ca34c4fd5f
Fix removing of folder when the folder is locked on windows.
...
When the folder is locked on windows, rmdir fails and the folmder is not
removed. But on the next sync, one should try to remove that folder again, and
not upload it to the server as we did before.
There was two problems:
1- The removed folder is still in the DB, so when csync_update read from
DB, for the remote, it still finds it. Fix that by storing an empty MD5
for directories that should have been deleted.
2- The folder is likely to be modified since its contents are gone.
Which means next sync will try to sync it back to the server.
Fix that by refreshing the mtime in the tree
2013-02-13 19:20:26 +01:00
Olivier Goffart
1be65be68e
Fix crash in owncloud_mkdir
...
ne_simple_request destroy the request, we cannot access the error code
after it.
2013-02-13 18:25:28 +01:00
Olivier Goffart
b6a37064e9
Allow to configure the timeout in the config
2013-02-13 18:25:28 +01:00
Olivier Goffart
2e945c07af
owncloud: fix session cookie again.
...
Some load balancers may add more cookies, and we would pick the wrong
one. So keep all the cookies.
If we already read a session cookie, don't parse more cookie as they are
not session cookie.
2013-02-13 18:25:28 +01:00
Klaas Freitag
7d1d880a9b
Return a proper error code in case the file is locked on win32.
2013-02-13 12:38:50 +02:00
Jenkins for ownCloud
8a06b2d136
[tx-robot] updated from transifex
2013-02-13 00:06:54 +01:00
Daniel Molkentin
7ba8a55fa5
Merge pull request #313 from hefee/doc2default
...
creating doc to default target
2013-02-12 11:48:00 -08:00
Daniel Molkentin
ee7dc8e1c5
Merge pull request #312 from hefee/master
...
usefull manpages for owncloud and mirall
2013-02-12 11:47:41 -08:00
Olivier Goffart
b028c64325
In case of error dirring a rename, mark the source as updated
...
That way, the file will be saved in the DB again, and the next try, it
will retry to rename
2013-02-12 15:11:15 +01:00
Olivier Goffart
79bbbe75d7
Report error to the callback in mkdir and rename
2013-02-12 13:36:17 +01:00
Jenkins for ownCloud
3556f90d68
[tx-robot] updated from transifex
2013-02-12 00:20:28 +01:00
Klaas Freitag
6d984b505d
Handle not stored password correctly.
2013-02-11 14:21:53 +01:00
Klaas Freitag
8d9336f9f4
Removed obsolete scheduler start.
2013-02-11 14:21:21 +01:00
Klaas Freitag
2b5e694181
Set default argument to method.
2013-02-11 14:20:32 +01:00
Klaas Freitag
aa983e4966
Make user password dialog real async working.
2013-02-11 14:18:45 +01:00
Klaas Freitag
424b3a9dfc
cleanup comments and dupes.
2013-02-11 14:18:16 +01:00
Jenkins for ownCloud
5a3bc7af9a
[tx-robot] updated from transifex
2013-02-11 00:05:57 +01:00
Klaas Freitag
4501ec10dc
Make sure that journals are wiped if server changes + some utility
...
functions.
2013-02-10 20:04:03 +01:00
Klaas Freitag
75cc77b947
Fixed build on win.
2013-02-10 16:43:38 +01:00
Klaas Freitag
699ae176df
Revert "Allow setting of custom poll interval through status.php"
...
This reverts commit 39a89e8fc7
.
Conflicts:
src/mirall/folderman.cpp
src/mirall/folderman.h
2013-02-10 14:57:57 +01:00
Klaas Freitag
9297b3b850
Add chrome download file to exclude list
2013-02-10 14:48:17 +01:00
Klaas Freitag
cac5f81388
Clear pending network requests in setup wizard on back.
2013-02-10 14:03:09 +01:00
Klaas Freitag
28af8068e9
Always return QNetworkReply* on mkdir and also on checkInstall.
2013-02-10 14:01:38 +01:00
Sebastian Kügler
a1d64af7b1
API additions for the Plasma client
...
This patch contains a few (source-compatible) API additions needed for
the Plasma client.
* return QNetworkReply* to caller for tracking status and error of
requests such as mkdir, getWebDAVPath and getRequest
* Add a setter for the QNetworkAccessManager. This allows us to route at
least some of the network requests through KIO in the Plasma client
* Add a setter for the remotePollInterval. This should be enough API to
* make it possible to adapt the polling interval to the client's machine
state, e.g. sync less often on battery, or somesuch
2013-02-10 13:10:53 +01:00
dragotin
edbb79b79c
Merge pull request #5 from sebasje/mkdirreply
...
Return QNetworkReply from remote mkdir
2013-02-10 02:34:36 -08:00
dragotin
a000a7b52e
Merge pull request #4 from sebasje/requestreply
...
Return QNetworkReply from getRequests
2013-02-10 02:34:14 -08:00
Klaas Freitag
0a427541d6
Added config file setter for poll interval. Thx for pull request.
2013-02-10 11:27:21 +01:00
Klaas Freitag
1c297c56a2
Stop authentication tries already after the first attempt without
...
success.
2013-02-10 11:02:39 +01:00
Klaas Freitag
6f9bbc431d
Properly stop syncing when connection manager opens.
2013-02-10 11:02:39 +01:00
Klaas Freitag
f62626e3eb
Delete existing folders properly before adding new ones.
2013-02-10 11:02:38 +01:00
Jenkins for ownCloud
28fcd75494
[tx-robot] updated from transifex
2013-02-10 00:11:52 +01:00
Klaas Freitag
c98f2dfba9
Do PROPFIND with multiple attempts to fix owncloud/mirall #285
...
temporarily.
2013-02-09 17:13:57 +01:00
Klaas Freitag
0410771d1b
Log the response buffer if the propfind response is not XML.
...
This will help to debug the problem described in bug owncloud/mirall
2013-02-09 17:13:56 +01:00
Klaas Freitag
b92a5f55b8
Fixed a typo lintian brought up.
2013-02-09 17:13:56 +01:00
Klaas Freitag
39a89e8fc7
Allow setting of custom poll interval through status.php
2013-02-09 14:04:04 +01:00
Klaas Freitag
38a8096732
Fixed sorting of header entries, ie. public / protected / private.
2013-02-09 14:03:05 +01:00
Klaas Freitag
d358c839ce
Fixed typos.
2013-02-09 12:46:08 +01:00
hefee
17901e7bc7
fixing typo in mirall.1.rst
2013-02-09 12:28:43 +01:00
hefee
0ea16c04cc
moving description of config file and client optinos to own files.
...
* split usage to three files: usage, conffile, options
* fixing minor typos in mirall.1.rst and owncloud1.rst
* owncloud.1 uses include conffile, options
* mirall.1 uses include conffile, options
* Fixes : #183
2013-02-09 12:23:32 +01:00
Klaas Freitag
f1e0cd1c9c
Cleaned up used icons.
2013-02-09 10:32:29 +01:00
hefee
e1f404a011
adding maclocation
2013-02-09 10:30:56 +01:00
hefee
69715d2182
merging from owncloud/master
2013-02-09 10:16:38 +01:00
hefee
0285213140
removing asciidoc, now creating manpages via sphinx again
2013-02-09 10:10:23 +01:00
hefee
1a907f23f0
moving generation of manpages to sphinx
...
--HG--
rename : doc/mirall.1.txt => doc/mirall.1.rst
rename : doc/owncloud.1.txt => doc/owncloud.1.rst
2013-02-09 10:05:45 +01:00
Jenkins for ownCloud
1296be71ed
[tx-robot] updated from transifex
2013-02-09 00:15:51 +01:00
Olivier Goffart
8646246e75
Also report the error for the other node in case of error
2013-02-08 21:51:03 +01:00
Olivier Goffart
5a262d7588
Fix crash in owncloud_mkdir
...
ne_simple_request destroy the request, we cannot access the error code
after it.
2013-02-08 21:06:25 +01:00