Joachim Schiele
9abc3e1333
fixes required by upstream
2015-01-23 19:22:56 +00:00
Olivier Goffart
fb79211514
Merge remote-tracking branch 'remotes/origin/win_context_menu'
2015-01-23 18:02:55 +01:00
Olivier Goffart
502e7081cf
Make it compile with neon
2015-01-23 17:59:07 +01:00
Olivier Goffart
dcba129a98
Make it compile without neon
2015-01-23 17:56:46 +01:00
Olivier Goffart
b856266e91
Remove neon link flag when not required
2015-01-23 17:35:17 +01:00
Markus Goetz
7f1f62e14a
CSync: Clean some more
2015-01-23 17:26:30 +01:00
Olivier Goffart
fe51ada1e8
Don't require NEON with Qt 5.4
2015-01-23 17:11:34 +01:00
Markus Goetz
6708c959d9
CSync: Remove c_list
2015-01-23 17:09:13 +01:00
Markus Goetz
af9daaeff7
CSync: Remove memory checks
...
We will get OOMed before this fails.
2015-01-23 16:59:51 +01:00
Olivier Goffart
a999884adf
osx integration: adapt to socket api changes
2015-01-23 16:13:16 +01:00
Olivier Goffart
807277c0ae
Socket API: Do not broadcast the shared menu entry on all socket when one connects to the socket API
...
Now we reply to the command SHARE_MENU_TITLE
2015-01-23 16:09:38 +01:00
Olivier Goffart
0af97156c9
Windows shell integration: Make the share entry work by adding a Sleep
...
Timeouts don't work with named pipe, so wait for 50ms to let time
for the client to answer
2015-01-23 15:43:03 +01:00
Markus Goetz
12ac9f9aa9
Discovery: Fix broken signal/slots
2015-01-23 15:37:36 +01:00
Markus Goetz
3885d5d706
Discovery: Report root etag from engine to folder
...
For #2352
2015-01-23 15:30:44 +01:00
Daniel Molkentin
f284786749
Fix typo
2015-01-23 14:44:53 +01:00
Markus Goetz
c54621eb19
OS X: Share menu for Finder
2015-01-23 12:00:31 +01:00
Klaas Freitag
2943b4a85a
CMake: Fixed the rpath settings to make the nighlies build again.
2015-01-23 11:50:42 +01:00
Klaas Freitag
ed4d31ebc5
Nautilus overlay: Use branded program name for menu item.
2015-01-23 11:50:42 +01:00
Klaas Freitag
ed0b4e48d5
Sharedialog: Fix some error display.
2015-01-23 11:50:42 +01:00
Roeland Jago Douma
f9938c90ff
Sharedialog: 404 is also an acceptable response when retriving shares
...
When we try to get the shares for a file/dir that has no shares yet 404 is an
acceptable response from the server.
2015-01-23 10:29:12 +01:00
Roeland Jago Douma
bcdc19f0e3
Sharedialog: Moved more logic to OcsShareJob
...
To make the Sharedialog a bit cleaner and to only have the logic in one place.
The postdata is now passed as a QList<QPair<QString, QString>> to the
OcsShareJob.
2015-01-23 09:41:10 +01:00
Roeland Jago Douma
fb967427e8
Sharedialog: We always want json return format
...
Cleanup the code a bit and set that we want json as return format for all
replies.
2015-01-23 09:17:00 +01:00
Roeland Jago Douma
0b10761291
Sharedialog: emit proper error code, only show error label if there is one
2015-01-23 09:10:02 +01:00
Daniel Molkentin
316c476bbd
Revert "Revert "Windows Shell Integration: Show status icon for root folder""
...
This reverts commit 176413d312
2015-01-22 19:13:12 +01:00
Daniel Molkentin
081cc0b9e8
WiP: Add Win32 Context menu integration
2015-01-22 18:45:20 +01:00
Olivier Goffart
560759ede8
Windows shell integration: Reduce the timeout time of WaitNamedPipe
...
This is maybe what causes the troubles of task #2576
2015-01-22 16:30:02 +01:00
Olivier Goffart
0f98a90858
Wizard: Add an option in the theme to default to nothing selected in the selective sync
...
Issue #2580
2015-01-22 15:57:55 +01:00
Christian Kamm
094da51d82
FolderWatcher: Fix ignore list usage.
...
All patterns with started with a ] were not working correctly.
2015-01-22 15:42:47 +01:00
Daniel Molkentin
39097980b0
Deployment: Accessiblewidgets no longer exists in Qt 5.4
...
Part of #2699
2015-01-22 15:27:19 +01:00
Olivier Goffart
3c26bfa618
Propagate Remote mkdir: save the fileid to the database early
...
It's important so that if we delete or rename a diectory that is being
uploaded, this is properly detected
2015-01-22 15:11:04 +01:00
Olivier Goffart
168c89aba7
Wizard: fix spacing
2015-01-22 15:11:03 +01:00
Markus Goetz
0502f684e9
Discovery: Even less qDebug
2015-01-22 14:45:08 +01:00
Markus Goetz
45cb679ea7
Discovery: Less verbose debug
2015-01-22 14:37:35 +01:00
Markus Goetz
c9f9d55658
Merge branch 'qnam_csync_update'
...
Conflicts:
src/libsync/networkjobs.cpp
2015-01-22 14:34:36 +01:00
Markus Goetz
d285db653e
CMake: Check for Qt version
...
This is still WiP, we need to compile without neon if possible
2015-01-22 14:27:49 +01:00
Markus Goetz
dde8e35785
Discovery: Put results into proper place in map
...
The map is for memory management.
It can later be used as a cache for the recursive PROPFIND
(if we decide to activate it again)
2015-01-22 14:25:24 +01:00
Olivier Goffart
5860e5a46b
Exclude *.tmp (as requested in #2424 )
2015-01-22 14:08:31 +01:00
Christian Kamm
fa4e6d8261
Exponential backoff for rapid follow up syncs. #2355
2015-01-22 08:55:52 +01:00
Christian Kamm
145df8ec67
Pause between sync runs (particularly long ones) #2355
2015-01-22 08:55:52 +01:00
Christian Kamm
af5cbdbed8
Folder: Add timer for sync duration.
2015-01-22 08:55:52 +01:00
Nourredine
ba8b1bbe06
adds 'SSL client certificate' support from n.octeau with qknight changes as:
...
* removed broken QSsl::SslV3 default
* rewrote slotHandleErrors(): no longer claim errors which are none.
* hack reverted: lib64 was not the cause for NixOS issues related to libraries.
* refactored csync/src/csync_owncloud.c and discovered+fixed why the dav_connect was never getting the certPath+certPassoword
* cleanup of code but seems this crushed the ssl client certificate support
* fixes the https://github.com/owncloud/client/issues/69#issuecomment-69358377 issue
* lots of cleanup
* From TODO list : translate all french comments into english
* changed _pemCertificate type from QString to QByteArray
2015-01-21 23:55:11 +00:00
Klaas Freitag
82e5e36c57
Nautilus: Display context menu for files that are not yet synced.
2015-01-21 17:41:57 +01:00
Olivier Goffart
f2a7e0b28f
Selective sync dialog: give a proper size by default
2015-01-21 15:37:00 +01:00
Olivier Goffart
0e86ceff73
Connection Validator: let the user cancel the password dialog
...
And don't ask for the password again if this happens
2015-01-21 15:33:51 +01:00
Olivier Goffart
c91de092e5
Setup wizard: Fix the http fallback logic
...
Also don't allow to go back from the advanced settings page because
this break everything
2015-01-21 15:33:51 +01:00
Markus Goetz
7a173f6e62
OS X: Fix path rewrite for owncloudcmd
...
It was broken after the folder restructuring (cmd/ and client/)
2015-01-21 15:17:40 +01:00
Klaas Freitag
95f7e83c5c
Sharedialog: Some more refinements after the merge of the branch.
...
- Some dialog changes: Made it less vertical space comsuming
- Some variable cleanups
- Allow to share files that are not within the synced dir by
copying them to the root of a sync dir first.
2015-01-21 15:05:23 +01:00
Olivier Goffart
d8b621d05f
LsColJob: fix getting the sizes when the path contains %-encoded chars
2015-01-21 12:04:54 +01:00
Markus Goetz
fb87ad1442
OS X: Fix path rewrite for owncloudcmd
...
It was broken after the folder restructuring (cmd/ and client/)
2015-01-20 19:03:56 +01:00
Markus Goetz
c580275a01
Discovery: Delete file entries on destruction
2015-01-20 18:49:27 +01:00
