Daniel Molkentin
c9ddb12b5a
Build after merge
2013-08-05 20:14:22 +02:00
Daniel Molkentin
0932ee6051
Merge branch 'shibboleth'
...
Conflicts:
src/CMakeLists.txt
src/mirall/application.h
2013-08-05 19:54:06 +02:00
Daniel Molkentin
ee1b8465a3
Revert "Temporarily log HTTP traffic done by MirallAccessManager."
...
This reverts commit 5930ca8ac7
.
2013-08-05 19:47:48 +02:00
Daniel Molkentin
26bd164168
Safer implementation for substitution of WebDav URL
...
- Use of RegEx is dangerous with folder names
containing e.g. '(' or ')'.
- Didn't work in my case at all.
2013-08-05 19:45:24 +02:00
Krzesimir Nowak
00e819bd92
Make sure we don't append several copies of cookies for syncing.
...
Also, make sure we don't append old Shibboleth ones as well.
2013-08-05 18:39:26 +02:00
Krzesimir Nowak
740d33b378
Revert "Go back if browser in wizard is destroyed before getting a cookie."
...
This reverts commit da370c8b36
.
2013-08-05 17:57:32 +02:00
Krzesimir Nowak
f0b284eda7
Refresh Shibboleth cookie if it gets outdated during sync.
2013-08-05 17:42:03 +02:00
Krzesimir Nowak
da370c8b36
Go back if browser in wizard is destroyed before getting a cookie.
2013-08-05 17:29:11 +02:00
Olivier Goffart
203b9c7f6b
leak fix
2013-08-05 16:49:18 +02:00
Daniel Molkentin
7932ec3cc1
IgnoreListEditor: slightly better text
2013-08-05 16:26:17 +02:00
Daniel Molkentin
3f15e02881
Add support for deletable ignores in IgnoreListEditor.
2013-08-05 16:13:26 +02:00
Olivier Goffart
6fb5c04bde
Finish danimo's patch that refactor the scheduler
...
Wait a full poll interval after the end of the sync
2013-08-05 15:15:15 +02:00
Olivier Goffart
578bcc3522
Remove scheduler logic from folderman and moved it in folderman
...
Also fetch and parse the etag when doing a PROPFIND to get the quota
(Patch from danimo)
2013-08-05 15:15:15 +02:00
Daniel Molkentin
99dea76fd1
Fix path display in folder wizard
...
The new implementation did not work correctly when owncloud is installed
in a subdirectory.
2013-08-05 14:28:05 +02:00
Jenkins for ownCloud
b680540adf
[tx-robot] updated from transifex
2013-08-05 06:54:39 -04:00
Klaas Freitag
67f57a443c
Disable unknown csync flags for now.
2013-08-05 12:30:24 +02:00
Klaas Freitag
2b3b4f9daf
Start setup wizard if no config exists on startup.
2013-08-05 12:19:53 +02:00
Klaas Freitag
ba01a697e6
Renamed test case to get rid of stinking name.
2013-08-05 09:39:06 +02:00
Klaas Freitag
16d81db117
Show deletes in progress.
2013-08-05 09:39:06 +02:00
Jenkins for ownCloud
4ce92f1a98
[tx-robot] updated from transifex
2013-08-04 01:26:52 -04:00
Jenkins for ownCloud
21c63637bd
[tx-robot] updated from transifex
2013-08-03 01:27:06 -04:00
Klaas Freitag
18f764e4d5
Fix a typo.
2013-08-02 21:55:09 +02:00
Krzesimir Nowak
5930ca8ac7
Temporarily log HTTP traffic done by MirallAccessManager.
...
To be reverted later.
2013-08-02 14:30:15 +02:00
Klaas Freitag
49be4a3be2
Propagate soft errors into SyncResult, icon fixes.
2013-08-02 14:22:01 +02:00
dragotin
1e50620f53
Merge pull request #822 from RealRancor/master
...
Updated options with missing cl switches - thanks a lot :)
2013-08-02 03:19:24 -07:00
Klaas Freitag
5e82dc1841
Some more refinements on item progress
2013-08-02 12:16:21 +02:00
RealRancor
33d76962a7
Updated options with missing cl switches
2013-08-02 11:59:57 +02:00
Klaas Freitag
6ce1c17ee1
Give application class control over itemprogressdialog
2013-08-02 11:33:45 +02:00
Jenkins for ownCloud
8d9b4d3669
[tx-robot] updated from transifex
2013-08-02 01:27:17 -04:00
Krzesimir Nowak
fb79b8a7f8
Omit the server setup page in wizard if URL is overriden by theme.
2013-08-01 19:17:41 +02:00
Krzesimir Nowak
b0236eaa24
Fix folder item being inactive.
2013-08-01 19:11:05 +02:00
Daniel Molkentin
19bbff708e
Improve FolderWizard
2013-08-01 18:22:13 +02:00
Klaas Freitag
1399ea13cc
Fixed rounding of size display.
2013-08-01 16:58:36 +02:00
Klaas Freitag
a25d9fd3b4
Added itemprogressdialog class to show the sync progress and problems.
2013-08-01 16:58:36 +02:00
Krzesimir Nowak
72d51e4667
Show browser as independent window instead of putting it into dialog.
...
When browser is shown, dialog is hidden. It reappears after we are
done with logging in.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
f6e3838eb2
Create a QNetworkAccessManager subclass which sets proper user agent and use it.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
c1fdecae2d
Fix misc warnings.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
4104db65bb
Remove unused method.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
36cb827406
Print correct subtitles when modifying account details.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
69a4558fe4
Actually use the remoteFolder sent by signal.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
928eae419f
Hide resolution widget in advanced setup page if nothing has changed.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
50edac8ee8
Split setup page into server and advanced parts.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
945951cda5
Fix indentation.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
fa95a638af
Fill username in HTTP credentials setup page.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
3b6aeb1fc8
Make browser inside Shibboleth wizard page a bit larger.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
6543a01418
Fix warnings emitted by clang.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
9724e52f1b
Fix warnings.
...
Should be now compilable when run with -Wall -Wextra -Wpedantic
-Werror.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
9413a30a08
Fix build when using QtKeyChain.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
6a9a2559d2
Fix shibboleth syncing after client restart.
...
We needed to notify shibboleth-specific QNAM about new cookie and then
stop cramming that cookie into request via setHeader, but rather put
it to cookie jar and let Qt handle the cookie insertion into requests.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
78b6f4df01
Move the creds/ and wizard/ directories one level higher.
2013-08-01 16:53:43 +02:00