14674 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Klaas Freitag	e9c4635f6b	tests: Add another two seconds break, hope to make it work in virt. env. ... Tests fail randomly on the CI computer which is virtualized. Maybe this fix helps.	2014-08-06 11:34:35 +02:00
Jenkins for ownCloud	7337010fd8	[tx-robot] updated from transifex	2014-08-06 05:10:32 -04:00
Daniel Molkentin	f06019ab81	NSIS: First steps at installing the shell extension	2014-08-06 10:44:17 +02:00
Olivier Goffart	55567f8dd2	remove unused variable	2014-08-06 10:20:58 +02:00
Klaas Freitag	2ccfdcb084	NautilusOverlays: return False if sock connection breaks	2014-08-06 09:52:52 +02:00
Daniel Molkentin	084d9de4c9	Add binary submodule	2014-08-06 09:28:18 +02:00
Jenkins for ownCloud	41875c2ddb	[tx-robot] updated from transifex	2014-08-06 01:25:31 -04:00
Daniel Molkentin	4ad9ff4301	Merge remote-tracking branch 'origin/win_overlay_icons' ... Conflicts: .gitignore	2014-08-05 19:27:51 +02:00
Daniel Molkentin	c7ff1e9b3f	Windows Shell extension: Add watched directories	2014-08-05 19:23:40 +02:00
Markus Goetz	fe3f751a8a	OS X: Slightly improve pkgproj ... It is still too much bound to Klaas' machine.	2014-08-05 17:16:17 +02:00
Daniel Molkentin	996b7166d2	Merge pull request #2027 from owncloud/l10n-fix ... Use am. eng. since brit. eng. is handled on transifex	2014-08-05 14:11:20 +02:00
Daniel Molkentin	839b2fa8fd	SocketAPI: Convert to unix path before comparing with black list	2014-08-05 13:11:52 +02:00
Daniel Molkentin	8b1aebcdba	No need to ship the Qt4-based qtkeychain DLL	2014-08-05 13:11:15 +02:00
Klaas Freitag	f4e2041b0b	CMake: Fix installation of the icons, path corrected.	2014-08-05 11:46:21 +02:00
Jenkins for ownCloud	24df6f838d	[tx-robot] updated from transifex	2014-08-05 01:25:26 -04:00
Markus Goetz	c313cc02f2	Config: Fix loading of configuration ... There is a strange bug with Qt, we need to always set the application name, then we can generate the proper config path.	2014-08-05 00:41:43 +02:00
Klaas Freitag	4e13c882f8	CMake: Install the nautilus plugin.	2014-08-04 18:58:35 +02:00
Klaas Freitag	0fe51d826f	Overlays: renamed icons to sensible names. Also removed .DS_Store	2014-08-04 17:22:34 +02:00
Klaas Freitag	b2976baf9b	NautilusOverlays: Use the correct icon names, removed unused function.	2014-08-04 17:21:49 +02:00
Klaas Freitag	a0a5a49d7b	CMake: Install icons under linux.	2014-08-04 17:20:57 +02:00
Daniel Molkentin	9a1781f613	Support for multiple icons	2014-08-04 15:40:08 +02:00
Klaas Freitag	f983264b5d	SocketAPI: Do not allow a trailing slash for directories. ... The entries in our sync journal have no trailing slashes for directories.	2014-08-04 12:47:22 +02:00
Klaas Freitag	40cebeedfc	SocketAPI: Call csync_exclude with the relative path. ... This avoids messing with the windows pathes and csync_exclude is designed that way.	2014-08-04 12:47:22 +02:00
Klaas Freitag	1f9280c68e	GUI: Remove useless comment.	2014-08-04 12:47:22 +02:00
Klaas Freitag	14ed261606	MacOverlays: Rather use FileManager API to check if is directory.	2014-08-04 12:03:01 +02:00
Klaas Freitag	4fb671e7f4	SocketAPI: Send Broadcasts only for Linux, not used on Mac and Win.	2014-08-04 11:09:17 +02:00
Klaas Freitag	aad5c96759	Mac Overlays: No crash on context menu actions. ... Disable overlay menus for now.	2014-08-04 11:09:16 +02:00
Jenkins for ownCloud	72b8da317f	[tx-robot] updated from transifex	2014-08-04 01:25:28 -04:00
Jenkins for ownCloud	7f9033f1f1	[tx-robot] updated from transifex	2014-08-02 01:25:24 -04:00
Volkan Gezer	a42e384935	Use am. eng. since brit. eng. is handled on transifex ... See https://github.com/owncloud/core/pull/10025#issuecomment-50855986 for info.	2014-08-02 04:05:10 +02:00
Klaas Freitag	9b37357513	cmake: Add the icons path to cmake, install the Mac icons properly.	2014-08-01 15:30:13 +02:00
Klaas Freitag	23269c9a08	Mac Overlays: load icons from the proper place in the system.	2014-08-01 15:26:18 +02:00
Klaas Freitag	327f70240c	GUI: Load the finder overlay icon script on MacOSX.	2014-08-01 14:28:34 +02:00
Klaas Freitag	0a7642dbe0	Mac Package: New shellscript and packages steering file.	2014-08-01 12:19:08 +02:00
Klaas Freitag	742b036a07	CMake: Follow policy for 2.8.0 (avoid cmake warnings)	2014-08-01 12:18:52 +02:00
Klaas Freitag	6e00989a9e	Add directory MacOSX to cmake processing.	2014-08-01 12:18:52 +02:00
Klaas Freitag	68f0227ca1	OverlaysMac: Make use of REGISTER_PATH to learn the synced dirs.	2014-08-01 12:18:52 +02:00
Klaas Freitag	fe9a2e7ba4	SocketAPI: Normalize file names when read from the filesystem. ... Otherwise there will be bad encoded file names because of a Qt upstream error that skips the normalization.	2014-08-01 12:18:52 +02:00
Klaas Freitag	a248fc36fe	Remove user XCode file.	2014-08-01 12:18:52 +02:00
Klaas Freitag	e28a7a7ae3	MacOverlays: Start a 5 seconds timer to try connect if unconn. ... If mirall is not here, a timer is started to try again later.	2014-08-01 12:18:52 +02:00
Klaas Freitag	b92789825d	MacOverlays: Redraw window if registered pathes are empty. ... That is the condition after a reconnect to the mirall server.	2014-08-01 12:18:52 +02:00
Klaas Freitag	c3b6aecb79	MacOverlay: Some logging cleanings.	2014-08-01 12:18:52 +02:00
Klaas Freitag	4688126f84	MacOverlays: Export the redraw method of content man.	2014-08-01 12:18:52 +02:00
Klaas Freitag	5a5c03a826	MacOverlays: Registered pathes support. ... Remember the pathes that come with the first UPDATE_VIEW msg. That reduces the number of socket communications.	2014-08-01 12:18:52 +02:00
Klaas Freitag	f3477877d0	Added XCode file.	2014-08-01 12:18:52 +02:00
Klaas Freitag	7bef588851	SocketAPI: Try reconnect if socket was not connected.	2014-08-01 10:59:50 +02:00
Klaas Freitag	72a25cf6ee	MacOverlays: Minor cleanups.	2014-08-01 10:59:50 +02:00
Klaas Freitag	74e13f4c70	Use better variable naming.	2014-08-01 10:59:50 +02:00
Klaas Freitag	3c09ef6cbf	SocketAPI: rename slot to send UPDATE_VIEW.	2014-08-01 10:59:49 +02:00
Klaas Freitag	68bfcf5d24	SocketAPI: Create the socket API instance in folderman.	2014-08-01 10:59:49 +02:00