Markus Goetz
79b547b83b
Icon Overlay OS X: Complain if icon couldnt be loaded
2014-08-26 17:21:15 +02:00
Olivier Goffart
2356601bb3
folder: Make sure not to pol the server if the account is disconnected
...
Fixes #2108
2014-08-26 16:23:19 +02:00
Olivier Goffart
9b88c7d3c1
SSLButton: fix memleak
2014-08-26 15:59:19 +02:00
Olivier Goffart
302499b483
uploading: make sure to cast to uint64 to avoid integer overflow
2014-08-26 15:58:55 +02:00
Dominik Schmidt
17e16f5e79
Add "Crash" entry to systray if started with --debug
2014-08-26 15:46:24 +02:00
Dominik Schmidt
b176ff6626
Don't use CMAKE_INSTALL_PREFIX for RPATH
2014-08-26 15:19:46 +02:00
Daniel Molkentin
e5471d8318
Build after merge
2014-08-26 14:33:21 +02:00
Daniel Molkentin
902bb7a198
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
Jenkins for ownCloud
03dc27a327
[tx-robot] updated from transifex
2014-08-26 01:25:22 -04:00
Jenkins for ownCloud
9291ace558
[tx-robot] updated from transifex
2014-08-25 01:25:17 -04:00
Jenkins for ownCloud
15c11ea172
[tx-robot] updated from transifex
2014-08-24 02:06:11 -04:00
Jenkins for ownCloud
cd6950d984
[tx-robot] updated from transifex
2014-08-24 01:25:18 -04:00
Jenkins for ownCloud
de96350bee
[tx-robot] updated from transifex
2014-08-23 01:25:22 -04:00
Markus Goetz
b037e6356e
TokenCredentials, DirectDownload: Rework cookie handling
...
That way we don't override QNAM's cookie jar behaviour
2014-08-22 13:46:22 +02:00
Markus Goetz
824628061b
Propagator: Don't have cookies overriden by QNetworkCookieJar
...
The direct download feature has its own cookies, don't let QNAM override them.
2014-08-22 12:12:46 +02:00
Jenkins for ownCloud
a9f1e165b5
[tx-robot] updated from transifex
2014-08-22 01:25:19 -04:00
Daniel Molkentin
c60b433c42
create shellext path
2014-08-21 20:33:25 +02:00
Daniel Molkentin
933c7e36d1
NSIS: fix target path for shell extension
2014-08-21 17:33:22 +02:00
Markus Goetz
449abace66
CSync: Ignore OS X files with hidden flag
2014-08-21 16:43:24 +02:00
Klaas Freitag
6025b3a91b
Bump version to beta1
2014-08-21 14:33:03 +02:00
Klaas Freitag
c473428be6
Merge pull request #2084 from owncloud/contextless_exclude
...
Contextless exclude, @ogoffart reviewed, I'll merge.
2014-08-21 13:15:18 +02:00
Klaas Freitag
e06e5fe55f
Excludes: Fix unit tests for the new exclude load interface.
...
Also removed some commented lines.
2014-08-21 13:12:05 +02:00
Klaas Freitag
dc8f437b31
Excludes: Add an context free implementation of exclude file loading.
...
So that we are more thread safe.
2014-08-21 12:43:04 +02:00
Daniel Molkentin
2219d409a4
Update binary submodule
2014-08-21 11:48:59 +02:00
Olivier Goffart
aabcf80774
Sync engine: Take also in account the fact that the instruction can be IGNORE on both tree
2014-08-21 11:33:38 +02:00
Olivier Goffart
1cf956ec21
Discovery phase: clear the callbacks after use
2014-08-21 11:27:25 +02:00
Daniel Molkentin
315c2eb4ca
Windows Shell Integration: Ensure precedence
2014-08-21 11:06:10 +02:00
Klaas Freitag
54e2b9345b
GUI: on Mac do not call slotUpdateAccountIcon
2014-08-21 11:00:57 +02:00
Jenkins for ownCloud
9743fee8f9
[tx-robot] updated from transifex
2014-08-21 02:06:14 -04:00
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