Daniel Molkentin
76e0d61b19
Windows Shell Integration: Register icons with well known name
2014-08-19 15:52:47 +02:00
Daniel Molkentin
cc6d83a953
Windows Shell Integration: Adjust port
2014-08-19 15:51:40 +02:00
Klaas Freitag
617887a0c6
Propagator: If the sync was interrupted by pausing, do not show error.
...
Handle problems which happen because of pausing the sync as soft errors
rather than normal errors which are blacklisted and displayed in the
gui.
This fixes bug #1959
2014-08-19 14:21:59 +02:00
Klaas Freitag
e4fe4cb4d3
Status icons: Display the correct icons after startup connect.
2014-08-19 14:21:59 +02:00
Klaas Freitag
dc0a054d94
Status icons: Set the offline icon at the very beginning.
...
Otherwise, if the account is signed out and opens the credential popup,
there is a wrong icon displayed. If the account is coming from keychain
this icon is quickly overwritten.
2014-08-19 14:21:51 +02:00
Klaas Freitag
924d9b985f
Some minor cleanups.
2014-08-19 14:21:51 +02:00
Klaas Freitag
bb3bd6930a
StatusModel: Have another property accountConnected.
...
With that , make the status model aware of the account connection state.
With that, we can grey out the correct state icon if the account is not
connected and display the normal icon if the account is connected.
2014-08-19 14:21:51 +02:00
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
Jenkins for ownCloud
2436ef9574
[tx-robot] updated from transifex
2014-08-19 02:06:17 -04:00
Jenkins for ownCloud
94f3a1ab1f
[tx-robot] updated from transifex
2014-08-19 01:25:24 -04: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
Daniel Molkentin
6fbbe2d0e4
Create ShellIconOverlayIdentifiers key
...
It may not exist. Registration fails in that case.
2014-08-18 17:06:26 +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
ddbe181e48
Update phase progress: Check if callback is defined.
2014-08-18 11:51:45 +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
Jenkins for ownCloud
8a7cfbd8de
[tx-robot] updated from transifex
2014-08-18 01:25:25 -04:00
Volkan Gezer
463a9a5485
space
2014-08-17 17:38:33 +02:00
Jenkins for ownCloud
ee7fe4a38a
[tx-robot] updated from transifex
2014-08-17 01:25:21 -04: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
Jenkins for ownCloud
5c5d57a996
[tx-robot] updated from transifex
2014-08-16 02:06:14 -04:00
Jenkins for ownCloud
de2ce5a0a2
[tx-robot] updated from transifex
2014-08-16 01:25:23 -04: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
8d819956d3
Tests: Fixed the CSync statedb test defined in the mirall module.
2014-08-15 18:33:04 +02:00
Klaas Freitag
4aec783362
Nautilus Overlays: Fix: do not change an dictionary which is iterated.
...
Also, item.invalidate_extension_info() is sufficient, no need to call
update_file_info afterwards.
2014-08-15 17:16: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
64a7025522
CSync: Add a 30 second connect (not read) timeout
2014-08-15 15:54:13 +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
b40b670639
Remove owncloud_logo_blue.png from mirall.qrc resource
...
It not used in mirall itself.
2014-08-15 15:12:42 +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
Jenkins for ownCloud
3909102436
[tx-robot] updated from transifex
2014-08-15 01:25:29 -04: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
Daniel Molkentin