Daniel Molkentin
ed05a24cc4
Merge pull request #2749 from vtsingaras/patch-1
...
Update Toolchain-mingw32-openSUSE.cmake
2015-01-28 13:10:42 +01:00
Christian Kamm
2cee591b0e
Merge branch 'sharedialog_fixes' of git://github.com/rullzer/client
...
Fix missing OcsShareJob constructor.
Conflicts:
src/gui/sharedialog.cpp
2015-01-28 12:19:40 +01:00
ckamm
8a71d7d254
Merge pull request #2730 from rullzer/filebrowser_integration
...
Sharedialog: 404 is also an acceptable response when retriving shares
2015-01-28 12:09:33 +01:00
Christian Kamm
7950eb8ed6
sqlite: Update to version 3.8.8.1. #2750
2015-01-28 11:52:04 +01:00
Christian Kamm
f59515883d
FolderMan: Require 2s minimum delay.
...
Otherwise we run into "can't upload because it's too recent" issues
when the folder watcher triggers a sync.
We used to do this, but my recent refactoring started counting the
time since the last sync against this minimum delay, leading to
1ms delays in practice. This fixes the regression.
2015-01-28 11:24:47 +01:00
Daniel Molkentin
2c432e0b97
Remove socketapiclient
2015-01-28 11:13:38 +01:00
Daniel Molkentin
524f04f34e
Wizard: Give useful error message when server access is forbidden
...
Final fix for #2607
2015-01-28 11:06:41 +01:00
Daniel Molkentin
9e7ee42eb7
Wizard Remove unused pointer
2015-01-28 11:06:41 +01:00
Daniel Molkentin
6f82e80698
Remove debug
2015-01-28 11:06:41 +01:00
Christian Kamm
37680a0909
ShareDialog: Prepare for multiaccount. #43
...
Also fix a possible bug with the share dialog when no account
is configured.
2015-01-28 10:52:55 +01:00
Christian Kamm
350ad98c27
Folderwizard: Prepare for multiaccount. #43
...
Avoid accessing the global account instance and instead pass it in
from the outside.
2015-01-28 10:40:32 +01:00
Daniel Molkentin
2a3df5562c
Add new Qt 5.4 dependencies, remove neon ones
2015-01-28 08:34:09 +01:00
Olivier Goffart
b0dbb49ca8
Shib: fix broken signal/slot connections
2015-01-26 16:23:43 +01:00
Vyronas Tsingaras
4603798996
Update Toolchain-mingw32-openSUSE.cmake
...
Fix cross-compiling for windows. change qt4 to qt5 since windows and OSX require Qt5 now.
2015-01-26 15:53:44 +02:00
Olivier Goffart
3169833cd7
gui: Still give a decent experience if there is no system tray
...
Helps for tasks #1138 , #2023 , #2123
2015-01-26 13:00:45 +01:00
Jenkins for ownCloud
75540e8a4c
[tx-robot] updated from transifex
2015-01-25 02:06:12 -05:00
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
