Commit graph

1257 commits

Author SHA1 Message Date
Daniel Molkentin
804aef6548 Remove stray code 2013-02-14 17:36:11 +01:00
Daniel Molkentin
85f49b6af4 Fix guard position 2013-02-14 17:36:11 +01:00
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
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
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
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
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
hefee
0ebcdbbb3f no more different cmake parameter is needed 2013-02-08 18:57:25 +01:00
dragotin
891ced0fca Merge pull request #318 from LukeOwncloud/patch-1
Update doc/usage.rst
2013-02-08 09:45:30 -08:00
dragotin
6276bb3873 Merge pull request #322 from hefee/soname
adding soname version to libowncloudsync and libmirallsync
2013-02-08 09:42:32 -08:00
Klaas Freitag
dbb0cbaff8 Removed build of obsolete mirallsync lib which is equal to owncloudsync. 2013-02-08 19:18:36 +01:00
Sandro Knauß
cfa777260c removing version for mirallsync (it is'nt build anymore :) 2013-02-08 18:37:29 +01:00
Sandro Knauß
66fc273db6 merging with default 2013-02-08 18:36:26 +01:00
hefee
9c9e377cf4 adding soname version to libowncloudsync and libmirallsync 2013-02-08 18:21:59 +01:00
Jenkins for ownCloud
f75eb24bfe [tx-robot] updated from transifex 2013-02-08 00:14:28 +01:00
LukeOwncloud
a617a04295 Update doc/usage.rst 2013-02-07 08:50:49 +01:00
Jenkins for ownCloud
dc16f277ce [tx-robot] updated from transifex 2013-02-07 00:12:34 +01:00
Klaas Freitag
07258deaaf Fix build for mirall target. 2013-02-06 15:05:34 +01:00