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
Jenkins for ownCloud
817f89d586
[tx-robot] updated from transifex
2014-06-20 01:25:21 -04: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
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
Jenkins for ownCloud
6ce746b9ea
[tx-robot] updated from transifex
2014-06-19 01:25:20 -04:00
Jenkins for ownCloud
6c3eb06b65
[tx-robot] updated from transifex
2014-06-18 01:25:22 -04:00
Jenkins for ownCloud
08398784e4
[tx-robot] updated from transifex
2014-06-17 01:25:29 -04:00
dark-eye
afea881d90
Merge pull request #1717 from dark-eye/master
...
Issue-142 : added time estimation and bandwidth indicator to the systray
2014-06-17 08:16:52 +03:00
Olivier Goffart
194bba2118
Merge remote-tracking branch 'origin/il' into tmp_master
2014-06-16 16:58:57 +02:00
Markus Goetz
a5967e4ecd
CSync: Fix win32 compile
2014-06-16 16:53:10 +02:00
Olivier Goffart
21e22a50c5
Merge remote-tracking branch 'origin/il' into master
2014-06-16 16:43:48 +02:00
Olivier Goffart
2f361278d2
Merge remote-tracking branch 'origin/1.6' into 'il'
2014-06-16 16:41:48 +02:00
Markus Goetz
319cf76417
CSync: Move compiler ifdef outwards
2014-06-16 16:26:00 +02:00
Markus Goetz
be7b08b50a
CMake: Fix token auth compile
2014-06-16 15:34:46 +02:00
Klaas Freitag
2d234cd96f
Propagator: Handle file open error properly and log error message.
2014-06-16 13:35:50 +02:00
Klaas Freitag
1230e87330
Propagator: Give a more specific error message on file remove.
...
If the file is removed during it is synced up, there is now a correct
error message saying that, rather than "the file has changed during
upload."
2014-06-16 13:34:59 +02:00
Jenkins for ownCloud
22c01748ce
[tx-robot] updated from transifex
2014-06-16 02:06:11 -04:00
Jenkins for ownCloud
02809d5016
[tx-robot] updated from transifex
2014-06-16 01:25:22 -04:00
Jenkins for ownCloud
d21f312936
[tx-robot] updated from transifex
2014-06-14 01:25:22 -04:00
Daniel Molkentin
b2966fecc7
Shib: remove slotLoadFinished() from webview dtor
...
This is a relict from when the webview was reused.
It is now pointless, since it's now destruct-on-close.
2014-06-14 03:00:18 +02:00
Daniel Molkentin
4abe00ff6c
Shib: Ensure browser view gets closed before QNAM
...
Otherwise, QWebPage tries to delete its QNetworkReplies, which have
already been deleted by the QNAM destruction, who is their parent.
Fixes #1840
2014-06-14 03:00:18 +02:00
Markus Goetz
357b041bb4
CSync: Give ctx to proxy callback
...
This fixes a crash.
2014-06-13 16:46:51 +02:00
Markus Goetz
61999a67cd
CSync: Give ctx to proxy callback
...
This fixes a crash.
2014-06-13 15:36:00 +02:00
Daniel Molkentin
8da97a7c6f
Merge remote-tracking branch 'origin/1.6'
2014-06-13 13:31:50 +02:00
Klaas Freitag
e1db834ec9
Add missing cmakedefine for HAVE_ASPRINTF and minor cleanup.
...
Fixes windows build.
2014-06-13 13:30:59 +02:00
Olivier Goffart
2caa69e0cb
blacklist: use the _ERROR instruction instead of _IGNORE
...
When something is in the blacklist, still use the _ERROR instruction
that way the applications can still report errors for blacklisted
items
2014-06-13 11:19:31 +02:00
Jenkins for ownCloud
c5932569f8
[tx-robot] updated from transifex
2014-06-13 01:25:21 -04:00
Klaas Freitag
c72c72a106
FolderWizard: Get folder map from FolderMan rather than store locally.
...
If the Folder::Map object is kept locally in the wizard, changes to
the map are not reflected there, as they happen when signing out.
This fixes bug #1875
2014-06-12 23:17:13 +02:00
Eran
1921d1a5be
Merge branch 'dark-eye-master'
2014-06-12 12:51:56 +03:00
Daniel Molkentin
4a5ef8f173
Fix a possible crash caused by a dangling pointer
2014-06-12 10:29:17 +02:00
Jenkins for ownCloud
8745a684ae
[tx-robot] updated from transifex
2014-06-12 02:06:12 -04:00
Jenkins for ownCloud
892cd962f8
[tx-robot] updated from transifex
2014-06-12 01:25:22 -04:00
Jenkins for ownCloud
3f543b881d
[tx-robot] updated from transifex
2014-06-11 02:06:11 -04:00
Jenkins for ownCloud
4a1d0eb80e
[tx-robot] updated from transifex
2014-06-11 01:25:22 -04:00
Klaas Freitag
ed26bcb3e7
Theme: Show the stringified app version rather than the major version.
...
This was a regression, we changed that by accident in 1.6.0.
(cherry picked from commit 760ecd71fc
2014-06-10 17:05:15 +02:00
Klaas Freitag
760ecd71fc
Theme: Show the stringified app version rather than the major version.
...
This was a regression, we changed that by accident in 1.6.0.
2014-06-10 13:48:27 +02:00
Jenkins for ownCloud
04f1026cd8
[tx-robot] updated from transifex
2014-06-10 01:25:24 -04:00
Jenkins for ownCloud
b03c4cc62e
[tx-robot] updated from transifex
2014-06-08 01:25:21 -04:00
Olivier Goffart
18e9357aaf
network limits: Fix warning
...
About the order of initialization
2014-06-07 12:20:54 +02:00
Olivier Goffart
46b8260693
network limits: Do not read them from the config file in the engine
...
Do that from the folder, because the engine can be used in app where
the MirallConfigFile is not accessible
2014-06-07 12:09:22 +02:00
Olivier Goffart
d5bd3190d4
csync unit tests: fix cimpilation
2014-06-07 12:08:58 +02:00
Jenkins for ownCloud
e497b6d458
[tx-robot] updated from transifex
2014-06-07 02:06:12 -04:00
Jenkins for ownCloud
2e4320ee05
[tx-robot] updated from transifex
2014-06-07 01:25:22 -04:00
Eran
3406fcdce4
Merge branch 'master' of https://github.com/owncloud/mirall into dark-eye-master
...
Conflicts:
src/mirall/progressdispatcher.h
2014-06-06 18:56:58 +03:00
Klaas Freitag
14a5ff6747
overlayIcons: First version of the nautilus overlay python module
2014-06-06 17:49:19 +02:00
