Klaas Freitag
1245ed6f06
Status Icons: Let FolderMan only write the folder config files.
...
Remove the setSyncEnabled() call to individual folders which mistakenly
set the folders to pause. Let the folders keep their pause state on their
own.
If FolderMan is set to be enabled emit a general refresh signal rather
than one for each folder.
2014-08-19 14:21:51 +02:00
Klaas Freitag
01b0ee49de
Status Icons: Rename the syncEnable method to isPaused.
...
Previously, in folder and folderman there have been the syncEnabled
properties, but they confused the semantics: While in FolderMan the
syncEnabled flag represents the network connection and stuff, in
Folder it represented if the user paused or resumed the folder.
This resulted in mixed use of both, which lead to wrong icon states.
This patch renames the folder methods and properties to isPaused to
make more clear about what it is.
2014-08-19 14:21:42 +02:00
Olivier Goffart
9c98883bea
propagator mkcol: If the server replies with a file-id in the header, use it
...
Newer server will have a file id directly in the file header.
https://github.com/owncloud/core/issues/9000
2014-08-18 20:42:43 +02:00
Olivier Goffart
2fb19e25b5
Fix clang 3.0 compilation
2014-08-18 19:44:18 +02:00
Olivier Goffart
c291eb3db4
Fix compilation error
2014-08-18 15:45:58 +02:00
Olivier Goffart
7f38ce8908
Selective sync: the button should only be enabled while connected
2014-08-18 15:45:38 +02:00
Olivier Goffart
1781400340
fix compilation
2014-08-18 15:28:24 +02:00
Olivier Goffart
3760f14da8
Restore the log window
2014-08-18 15:16:33 +02:00
Olivier Goffart
dc18366111
DiscoveryPhase: put in namespace Mirall
2014-08-18 14:45:48 +02:00
Olivier Goffart
936252765a
Merge branch 'master' into selective_sync
...
Conflicts:
src/mirall/syncengine.cpp
src/mirall/syncengine.h
2014-08-18 14:44:43 +02:00
Markus Goetz
b62b87eed3
OS X: Rename LiferayNativity code for shell icons
2014-08-18 12:57:29 +02:00
Klaas Freitag
4b716f3ea6
About page: Fix the translation of developer names.
2014-08-18 12:17:13 +02:00
Klaas Freitag
27f9d4523b
Settings: Display the commit SHA both in branded and unbranded.
...
Also, do not put the developer names into the translation string.
2014-08-18 11:27:56 +02:00
Volkan Gezer
463a9a5485
space
2014-08-17 17:38:33 +02:00
Klaas Freitag
dccb9def3a
Merge pull request #2067 from owncloud/grammar
...
subject verb agreement - very good, thanks.
2014-08-16 12:13:01 +02:00
Sandro Knauß
7b114e2cae
Use QStandardPaths for linux if building with qt>=5
2014-08-16 03:12:20 +02:00
Volkan Gezer
25d519fed3
subject verb agreement
2014-08-15 20:49:47 +02:00
Klaas Freitag
b494181764
Nautilus Overlays: Use port 34001 by default.
2014-08-15 17:16:47 +02:00
Olivier Goffart
9575271fcd
Selective sync: hide the header
2014-08-15 16:49:22 +02:00
Olivier Goffart
b6eda9076e
Selective sync: add a page in the folder wizard
2014-08-15 16:40:11 +02:00
Markus Goetz
88072a985a
SyncEngine & UI: Move QElapsedTimer to object
...
Using a function static is too dangerous when multiple threads are involved.
2014-08-15 16:20:43 +02:00
Markus Goetz
c27f151451
SyncEngine & UI: Make the function part of UpdateJob
...
That way we can easily emit UploadJob's signals
2014-08-15 16:11:51 +02:00
Markus Goetz
ce2741cebc
SyncEngine & UI: Progress notifications for update phase
...
For each directory (local and remote, we have UI update throtting code)
a signal is emitted.
It is used by the settings dialog and the tray menu.
2014-08-15 15:28:35 +02:00
Daniel Molkentin
3d6b622879
Merge pull request #2064 from owncloud/fix-1959
...
Show folder icon a offline when account is offline
2014-08-15 15:11:06 +02:00
Daniel Molkentin
4c67a8812a
Show folder icon a offline when account is offline
...
Fixes #1959
2014-08-15 15:01:01 +02:00
Olivier Goffart
4c4d02c0d0
Selective Sync: refactor the widget in its own class
2014-08-15 14:58:16 +02:00
Olivier Goffart
c1831f4946
Selective sync: use a black list instead of a white list
2014-08-15 12:29:10 +02:00
Olivier Goffart
4b2c1bacd1
Merge remote-tracking branch 'origin/master' into selective_sync
2014-08-15 10:28:50 +02:00
Klaas Freitag
78e50747e4
Updated the about text for the generic ownCloud Theme.
2014-08-14 17:12:23 +02:00
Klaas Freitag
b09498d852
csync journal: Improve get_below_path query.
...
Add another index on the pathlen column. Use that column to deselect
all rows that are shorter than the path to search files below. That
shrinks the amount of rows to examine using LIKE tremendously by
a cheaply to query for criteria.
2014-08-14 13:52:44 +02:00
Klaas Freitag
7fcf723039
SyncJournal: Add an index on inode to the journal database.
2014-08-14 13:22:43 +02:00
Klaas Freitag
d27ab8c6ca
Revert "FolderMan: Proper singleton implementation."
...
This reverts commit 0350508b65
2014-08-14 12:46:01 +02:00
Klaas Freitag
0350508b65
FolderMan: Proper singleton implementation.
...
The connect in SocketAPI had to be moved because it also uses
FolderMan::instance(). And since SocketAPI is instanciated in
FolderMans constructor, this was a deadlock.
Now the connect is tried on every new socket connection in SocketAPI
but I assume that multiple attempts to connect are not an issue.
2014-08-14 11:32:03 +02:00
Klaas Freitag
32739cc305
SyncEngine: End the journal transaction after update.
2014-08-14 11:32:02 +02:00
Klaas Freitag
f515fe77c4
SyncJournal: Fix logging text.
2014-08-14 11:32:02 +02:00
Daniel Molkentin
4fc044d368
Merge branch 'master' into move_lib_to_sep_dir
...
Conflicts:
cmake/modules/NSIS.template.in
src/CMakeLists.txt
src/creds/shibboleth/authenticationdialog.cpp
src/creds/shibboleth/authenticationdialog.h
src/gui/owncloudgui.cpp
src/libsync/creds/shibboleth/authenticationdialog.cpp
src/libsync/creds/shibboleth/authenticationdialog.h
src/libsync/mirallaccessmanager.cpp
src/mirall/authenticationdialog.cpp
src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02:00
Daniel Molkentin
1544606bf0
Always handle 401 requests, except for network jobs
...
It is not enough to only implement it for the QNAM returned
by the ShibbolethCredentials, because we sometimes need it
when we have no valid credentials set (and are using dummy
credentials in the course). The main use case is the
Webview opened by Shibboleth for FBA.
But as a side-effect, we can use it to handle auth requests
from the updater and other places.
2014-08-12 19:25:59 +02:00
Olivier Goffart
255330d342
Add a "Skip Folder Configuration" button in the wizard
...
This allow to start owncloud the first time but not automatically sync
everything, but let the user configure sub folders instead
2014-08-12 17:34:54 +02:00
Olivier Goffart
ad139e19ab
Fix error reported by address sanitizer
...
Qt allow to call deleteLater on a null object, but it is an undefined behaviour
2014-08-12 17:34:54 +02:00
Markus Goetz
8e6e51f9a6
OS X: Move include to MAC define
2014-08-12 14:58:34 +02:00
Markus Goetz
faa502163e
OS X: Finally(?) fix stay-on-top behaviour of settings dialog
...
Fixes #1795
2014-08-12 14:48:42 +02:00
Olivier Goffart
4ff0e7e0a2
Silent some warnings
2014-08-12 14:03:04 +02:00
Olivier Goffart
12459bf07e
selective sync: fix whitelist matching
2014-08-12 11:43:42 +02:00
Olivier Goffart
b25ef28e82
Selective sync: remember the old list when accepting the dialog even if the tree was not expanded
2014-08-12 11:12:58 +02:00
Olivier Goffart
7e009667a2
Selective sync: ignore the files that are not in the selective sync white list
2014-08-11 18:42:24 +02:00
Olivier Goffart
1f1eb933d1
Move the update job in a new file named discoveryphase
...
"Discovery" is a better name than "update"
2014-08-11 18:42:24 +02:00
Olivier Goffart
aa85e875bd
Selective sync: Add UI to select paths
2014-08-11 18:42:24 +02:00
Daniel Molkentin
1b4c613fa6
ProtocolWidget: Disable copy button if widget is empty.
2014-08-11 16:38:51 +02:00
Markus Goetz
8cd1d43798
TokenCredentials: Don't overwrite Cookie header
...
If the request already had a cookie header, there was a reason for it.
Don't blindly overwrite it.
2014-08-11 15:40:12 +02:00
Markus Goetz
acd3df33b6
Merge branch 'long_running_put' into il
2014-08-08 12:00:26 +02:00
