Jenkins for ownCloud
696f801df0
[tx-robot] updated from transifex
2014-08-21 01:25:23 -04:00
Klaas Freitag
fef0d0b31c
Overlays Nautilus: Handle UNREGISTER_PATH and do proper reconnect.
...
This is needed to fix #2073
2014-08-20 17:33:48 +02:00
Klaas Freitag
75101a0319
Application: Unload all folders when shutting down.
...
That sends a proper UNREGISTER message via socket API.
2014-08-20 17:33:48 +02:00
Klaas Freitag
d1a660ce20
SocketAPI: Add parameter to enable wait for the socket write.
...
This is needed to wait until the UNREGISTER message is sent to the
shell code when mirall shuts down.
2014-08-20 17:33:48 +02:00
Klaas Freitag
4356005c5a
FolderMan: Do not remove the folder icon too early from the map.
...
Otherwise, method unloadFolder can not do important frees.
This is one part of the fix for #2073 because now the socketapi will
send the UNREGISTER_PATH message over the socket.
2014-08-20 17:33:48 +02:00
Daniel Molkentin
86a00eee3f
Merge pull request #2079 from owncloud/nsis_use_installlib
...
Use InstallLib to install the overlay icons
2014-08-20 17:19:40 +02:00
Daniel Molkentin
ccf532672b
Use InstallLib to install the overlay icons
...
This allows for a cleaner expirience
2014-08-20 16:07:22 +02:00
Daniel Molkentin
6b52e9db34
Fix crash in accountsettings
2014-08-20 16:07:06 +02:00
Daniel Molkentin
8fdee79505
Fix crash in accountsettings
2014-08-20 16:06:38 +02:00
Markus Goetz
d9de6e68ad
OS X: Optimize Finder icon drawing code
...
Don't have an intermeditate TIFF.
2014-08-20 14:02:58 +02:00
Klaas Freitag
988fe70771
Merge pull request #2075 from owncloud/use_folder_paused
...
Rework of the status icons in FolderMan and Folder objects.
2014-08-20 10:50:28 +02:00
Jenkins for ownCloud
132fac86d7
[tx-robot] updated from transifex
2014-08-20 01:25:19 -04:00
Klaas Freitag
d02175210b
Status Icon: Set a proper icon if no sync is configured.
...
This fixes bug #1956
2014-08-19 17:47:28 +02:00
Daniel Molkentin
1dd3d080b8
Update binary submodule
2014-08-19 17:25:59 +02:00
Daniel Molkentin
d171431ac7
Windows Shell Integration: Add version information
2014-08-19 15:52:58 +02:00
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
