Daniel Molkentin
f8b097669a
Merge remote-tracking branch 'origin/1.6'
...
Conflicts:
VERSION.cmake
doc/building.rst
2014-06-27 15:34:20 +02:00
Klaas Freitag
e76386be4f
Revert "ownCloudcmd: Use Account object and ConnectionValidator."
...
We decided that owncloudcmd should not share the config with mirall.
This reverts commit 5f96de32bb
.
2014-06-26 10:16:56 +02:00
Klaas Freitag
5f96de32bb
ownCloudcmd: Use Account object and ConnectionValidator.
...
That reads the credentials from the mirall config file if it was not
defined on the command line. Moreover, the connection is validated
before, which sets up the credentials properly.
2014-06-24 15:33:42 +02:00
Klaas Freitag
d2436ce23d
Networkjobs: Check if reply body is empty before parsing.
...
This avoids a false warning that the result is not valid JSON.
2014-06-24 15:17:33 +02:00
Olivier Goffart
9adc30ab9f
Shibboleth: keep the cookie from the wizard to the ShibolethCredentials
...
Otherwise the user is asked twice for autentication on first sync.
Fixes https://github.com/owncloud/enterprise/issues/193
2014-06-24 11:44:52 +02:00
Olivier Goffart
94ddf7e5d8
Merge remote-tracking branch 'origin/il'
2014-06-24 08:40:27 +02:00
Olivier Goffart
b735dc07d6
Permissions: Consider and empty remotePerms from csync as NULL
...
Since remotePerm from csync is never NULL (as it is a buffer),
we consider that if it is empty, there was no permission set
(and therefore everything is allowed)
csync will put a space in the permission if any permission was set
2014-06-23 15:05:48 +02:00
Olivier Goffart
68c902e60b
propagator: Fix restoring directory
...
If the result of a restored directory is SoftError, this prevent
to sync the rest of the directory
Therefore, we introduced a new status Restored, which means that
the job was a success, but is a restoration and therefore should be
seen as a warning
2014-06-23 13:56:17 +02:00
Olivier Goffart
e19214c3c4
permissions: record them even if the instruction is NONE
...
when the instruction is NONE, we may return from this function
before having registered the permission in the SyncEngine::_remotePerms
hash.
Move the code a bit up.
2014-06-23 13:35:34 +02:00
Olivier Goffart
4759429702
Fix compilation after merge
...
Some initializer were added in 1.6 for variable that are gone in master
2014-06-23 12:53:51 +02:00
Olivier Goffart
b626589c07
Merge branch 'il'
...
Conflicts:
src/mirall/folderstatusmodel.h
2014-06-23 12:52:03 +02:00
Olivier Goffart
02704cdf74
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
csync/src/csync_statedb.c
src/mirall/syncengine.cpp
src/mirall/syncfileitem.h
2014-06-23 12:48:34 +02:00
Daniel Molkentin
7a8a3855b8
Mac: Make <ESC> close the settings dialog again
2014-06-20 16:37:07 +02:00
Daniel Molkentin
603a238eb9
Disable minimize button for Preferences on Mac
2014-06-20 16:31:17 +02:00
Olivier Goffart
b7b6cf4b3f
Shibboleth: Always ask for the password if we are going to open the log window
...
If we don't have the cookie in the keychain (e.g. the keychain is
unavailable) but there is still session cookie in the cookie jar,
showing the browser won't ask for authentication.
2014-06-20 16:25:35 +02:00
Daniel Molkentin
485a6926c5
FancyLineEdit: initialize all members
...
This fixes Coverity CID 12912
2014-06-20 13:46:57 +02:00
Daniel Molkentin
f3de6f46db
Folder: Removed unused member _pathWatcher
...
This fixes Coverity CID 12914
2014-06-20 13:42:26 +02:00
Daniel Molkentin
1309dc27d9
Remove previously unused member
...
This fixes Coverity CID 12915
2014-06-20 13:40:55 +02:00
Daniel Molkentin
31469d6a3e
Folderwizard: Properly initialize all members
...
This fixes coverity CID 12916
2014-06-20 13:38:36 +02:00
Daniel Molkentin
88776770f7
Legacy Propagator: Properly initialize members
...
This fixes coverity CID 12919
2014-06-20 13:36:15 +02:00
Daniel Molkentin
bbf8b9f8dd
syncengine: properly initialize all members in ctor
...
This fixes Coverity CID 12922
2014-06-20 13:28:52 +02:00
Daniel Molkentin
6ff38d8005
Cleanup member initialization in Theme
...
This fixes coverity issue 12925
2014-06-20 13:28:52 +02:00
Daniel Molkentin
6d13b5cc43
wizard setuppage: Clean up and properly initialize members
...
This fixes Coverity CID 12926
2014-06-20 13:28:52 +02:00
Daniel Molkentin
73ab2804c4
owncloudwizard: properly initialize _account memember
...
This fixes Coverity CID 12927
2014-06-20 13:28:52 +02:00
Klaas Freitag
d995d1190f
SyncFileItem: Some more proper member initializations.
...
This fixes a Coverity CID
2014-06-20 12:54:46 +02:00
Klaas Freitag
3217e42a0f
SyncJournalDB: Initialize size member properly with 0
...
This fixes Coverity CID 12924
2014-06-20 12:37:49 +02:00
Klaas Freitag
1dd58a537e
owncloudcmd: Fix structurally dead code.
...
This fixes Coverity CID 12928
2014-06-20 12:34:15 +02:00
Olivier Goffart
3e916cfbb9
remove unused member
...
CID 12915
CID 12926
2014-06-20 12:08:58 +02:00
Olivier Goffart
4a9ad14e11
Folder: remove unused variable
...
CID 12914
2014-06-20 12:01:20 +02:00
Olivier Goffart
f80816d88f
SyncEngine: silence coverity issue 12885
...
It was complaining that we use the context later in the function
but the csync context should never be null anyway
2014-06-20 11:53:22 +02:00
Olivier Goffart
61ad376bf4
accountsettings: silent coverity warning 12884
...
We use f anyway, so if we are going to test if it's null we can as
well return
2014-06-20 11:51:07 +02:00
Olivier Goffart
1e788d3d60
folderwizard: fix possible use of null pointer
...
Coverity issue 12907
2014-06-20 11:29:28 +02:00
Olivier Goffart
83171bf025
accountsettings: remove unused function
...
It was moved into owncloudgui before
And it was broken (bad use of QUrl and use of null pointer
2014-06-20 11:27:37 +02:00
Olivier Goffart
2e51721851
owncloudgui: Fix compilation
2014-06-20 11:26:41 +02:00
Olivier Goffart
4d4a0148e4
owncloudgui: use QUrl::fromLocalFile
2014-06-20 11:21:36 +02:00
Daniel Molkentin
6b041b0846
Fix use-after-free in QNAM propagator
...
This fixes Coverity CID 12929
2014-06-20 10:58:03 +02:00
Olivier Goffart
458645101b
SocketApi: query the database for the Shared flag
2014-06-19 15:37:29 +02:00
Olivier Goffart
1e306012ec
SocketApi: Fix recursiveFolderStatus
...
If only one file is EVAL or NEW, this mean the folder need to be sync
2014-06-19 15:25:30 +02:00
Olivier Goffart
db2c198feb
SocketAPI: Merge command_RETRIEVE_FOLDER_STATUS and command_RETRIEVE_FILE_STATUS
...
They do the same thing because fileStatus calls recursiveFolderStatus
for directories anyway
2014-06-19 15:02:27 +02:00
Markus Goetz
71a901a24e
TokenCredentials: Fix cookie behaviour
...
parseCookies did not work as expected. Now we just hard-set the
token credentials into the Cookie header for QNAM jobs.
This is the same behaviour as for neon jobs.
(cherry picked from commit 855a8c0a335f76b82b8e647a8c5a4ae692065d3b)
2014-06-19 14:41:47 +02:00
Olivier Goffart
f4ea34e63b
SyncJournalDb: use QByteArray for etag and fileid
2014-06-19 14:27:04 +02:00
Olivier Goffart
0d54b88ab2
Socket API: Make it work with Qt5's QUrl
...
QUrl default constructor has a different behaviour in Qt5
One must not forget to call QUrl::fromLocalFile in Qt5
2014-06-19 14:22:03 +02:00
Olivier Goffart
da0bd14bf3
Socket API: move the code that gets the status out of the folder
...
Move the code in socketapi.cpp where it belongs
2014-06-19 14:08:30 +02:00
Olivier Goffart
02355696ff
engine: When restoring the file, use the mtime and fileid from the server
...
Important to switch the things around as we are going to write them in the DB
2014-06-18 16:15:14 +02:00
Olivier Goffart
646eafb05d
Legacy propagator jobs: Do not limit bandwidth when aborting
...
When aborting, we want the last job to be as fast as possible
as it blocks the UI. So don't limit the bandwidth in that case
2014-06-18 15:09:19 +02:00
Olivier Goffart
0880444e37
Syncengine: Wait for the neon thead to be finished before destroying the Propagator and calling csync_commit
...
The legacy job might still need the neon session and the propagator.
We need to make sure the thread exits before.
This fixes crash when pausing a sync made with the legacy jobs
(for example when there is network limitation)
This should fix https://github.com/owncloud/enterprise/issues/200
2014-06-18 15:08:23 +02:00
Klaas Freitag
b71881d300
SyncEngine: Use QSet for the seenFiles rather than QHash.
...
We can save some memory here as the seenFiles list can be long.
2014-06-17 16:30:11 +02:00
Daniel Molkentin
b91967f4d9
Fix regression over 1.5: Fix non-fba auth for Shib IdPs
2014-06-17 14:53:23 +02:00
Olivier Goffart
c759e8bb8f
permission: read them from the tree
2014-06-17 14:50:24 +02:00
Olivier Goffart
b83f6c0b3a
sync engine: try to respect permission
...
This is still Work in progress
2014-06-17 14:44:58 +02:00