16764 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jocelyn Turcotte	03e23da6a3	Show the settings also when no arguments are passed ... sendMessage would only be called if there were options to be sent to the running application. Fix the issue by having explicitly named messages and always send the show settings message. Issue #2374	2015-02-19 16:57:16 +01:00
Jocelyn Turcotte	2ddaf5a06a	Add a NO_MSG_HANDLER cmake option ... This allows QDebug to output to stdout or OutputDebugString to ease development.	2015-02-19 16:57:16 +01:00
Olivier Goffart	5e1aa7d383	SyncEngine: Fix move would re-upload the file ... Because SyncJournalDb::postSyncCleanup was deleting the entries in the database	2015-02-19 15:00:37 +01:00
Olivier Goffart	e1871eb325	libsync: Fix qWarning in SyncEngine::slotJobCompleted saying we cannot find the sync item when moving ... We need to compare against the original file name, that's why it's there	2015-02-19 13:13:45 +01:00
Daniel Molkentin	1aaa9db34e	Don't translate dummy strings	2015-02-19 11:34:15 +01:00
Olivier Goffart	66fc8e9e27	Merge branch 'master' into 1.8	2015-02-19 11:32:16 +01:00
Daniel Molkentin	cd20208fdc	Activity view: Always add date ... Fixes #2223	2015-02-19 10:46:18 +01:00
Jenkins for ownCloud	3259cf59f5	[tx-robot] updated from transifex	2015-02-19 02:19:25 -05:00
Jocelyn Turcotte	c6442f67c1	shell_integration: Fix a crash on explorer startup ... There is a race condition that can initialize the RemotePathChecker instance concurrently on the same address and cause a crash when locking the mutex. The reason is that local static initialization is not thread-safe with MSVC2013. Fix the issue by using call_once to initialize a static unique_ptr instead. This could be related to some reports of issue #2836.	2015-02-18 17:33:46 +01:00
Olivier Goffart	1998b602b9	SyncEngine: better merge of the renames node ... The same file is on the two sync trees under different names in case of a rename We must therefore use the rename target as the key in the _syncItemMap to ensure that the trees are correctly merged. Also use the same UTF-8 decoding for the target than for the actual file in order to catch invalid utf-8 in the rename target	2015-02-18 12:41:06 +01:00
Olivier Goffart	193fca4a8b	SyncFileItem::operator<: must return false when two items are equal ... Fixes #2852	2015-02-18 12:41:06 +01:00
Jenkins for ownCloud	9659d0bdc7	[tx-robot] updated from transifex	2015-02-18 02:18:34 -05:00
Jocelyn Turcotte	ccf4298c81	shell_integration: Cleanup our uses of NSLog ... Remove info messages and make sure that error messages have an OwnCloud prefix since they will be reported by Finder's process.	2015-02-17 18:23:30 +01:00
Jocelyn Turcotte	0b461e2275	shell_integration: Fix the overlay icons in the column view ... Based on 79a713ea643e13e95f52bfe2adbbaf4a5ca92f8a in upstream liferay-nativity.	2015-02-17 18:20:16 +01:00
Jocelyn Turcotte	4f4ae5861a	Enable c++11 regardless of the compiler detection ... CMake is using "c++" as the compiler and the clang detection fails. Since we require C++11 at this point, enable it in all cases. Removed the MSVC todos since we don't plan supporting it yet.	2015-02-17 18:20:15 +01:00
Daniel Molkentin	fedf368c7a	Merge pull request #2849 from owncloud/nsis_shortcuts_all_users ... Install shortcuts for all users	2015-02-17 18:13:11 +01:00
Daniel Molkentin	c5f78fab51	Make NSIS installer with /S fully silent ... Addresses #2006	2015-02-17 17:59:14 +01:00
Daniel Molkentin	56a907128a	Install shortcuts for all users ... Implements #2413	2015-02-17 17:17:39 +01:00
Olivier Goffart	fb77cd5f7e	SyncEngine: Fix detection of the server reconfiguration ... Some files might be kept (like the default files) The files should be considered as NONE only if they are NONE on both trees issue #2847	2015-02-17 16:44:13 +01:00
Daniel Molkentin	99d674c346	Default shiboolethwebview to 900x700, remember last size ... Also add host to the title Addresses #2285	2015-02-17 15:28:14 +01:00
Daniel Molkentin	9690ca0198	Explain the "crash now" button to translators	2015-02-17 14:03:09 +01:00
Olivier Goffart	9351c7485f	Try another way to fix the build	2015-02-17 14:04:16 +01:00
Olivier Goffart	d43b82dc82	Fix compilation with clang ... The compilation error was account.h:140:113: error: expected ')' const QList< QPair<QString, QString> > &queryItems = QList< QPair<QString, QString> >()); ^ followed by more errors. The problem is because the compiler has hard time disambiguiating the comma int foo(const QPair<int, int> &p = QPair<int, int>()); ^ It is indeed quite hard for the compiler to know if this comma is a separation between complate arguments or the separation between arguments of the functions. Use the C++11 construct instead which does not need commas	2015-02-17 11:09:45 +01:00
Olivier Goffart	ce195bd599	SyncEngine: add an getter to the journal	2015-02-17 11:08:16 +01:00
Olivier Goffart	c0c8a22fa3	SyncEngine: pass a non-const reference to the SyncFileItemVector in aboutToPropagate ... That way, users of the library can change the contents of the sync item vector.	2015-02-17 11:08:16 +01:00
Jenkins for ownCloud	93717c95fb	[tx-robot] updated from transifex	2015-02-17 02:18:24 -05:00
Jocelyn Turcotte	a955defae5	Raise the share window to make sure that the user sees it	2015-02-16 16:47:00 +01:00
Jocelyn Turcotte	9579102541	shell_integration: Generate a .pdb in Release for OCContextMenu_x64.dll	2015-02-16 16:47:00 +01:00
Daniel Molkentin	2423aa592f	Add new icons by Jan	2015-02-16 14:47:32 +01:00
Olivier Goffart	151228b2a6	Fix build when compiling libsync without QtGui ... Utility must stay QtGui-free, move the hidpiFileName to the theme which is the only part in libsync which uses it, and already has #ifdefs	2015-02-16 10:24:42 +01:00
Jenkins for ownCloud	025d74bbcd	[tx-robot] updated from transifex	2015-02-16 02:18:23 -05:00
Jenkins for ownCloud	7626478165	[tx-robot] updated from transifex	2015-02-15 02:18:23 -05:00
Daniel Molkentin	3dea1eb173	Merge pull request #2785 from owncloud/typos ... some typos, grammar and sentence fixes	2015-02-14 23:56:10 +01:00
Volkan Gezer	bd4f68233f	some typos, grammar and sentence fixes	2015-02-14 23:47:07 +01:00
Olivier Goffart	d6bdbf9f34	Logger: use qFormatLogMessage with Qt 5.4 so it respects the Qt logging preferences	2015-02-14 14:23:01 +01:00
Jenkins for ownCloud	2ccfb8671e	[tx-robot] updated from transifex	2015-02-14 02:18:27 -05:00
Olivier Goffart	04bb67ef45	Fix Qt4 build ... The automatic registration of metatype only came with qt5	2015-02-13 21:41:09 +01:00
Jocelyn Turcotte	4b67429234	shell_integration: Wait longer for the Share menu title ... 50ms is sometimes not enough when the client is busy synchronizing. Wait up to 500ms for the client to answer before we give up and show an empty menu title. Ideally we should request the title before the watched directory list, but the list is currently sent implicitly on connect.	2015-02-13 17:18:39 +01:00
Jocelyn Turcotte	23e248b5d1	shell_integration: Fetch the share menu title from the client on Windows ... The context menu will now show "Share with ownCloud" instead of "Share" as it does on other platforms. This also updates the submodule to point to matching binaries.	2015-02-13 16:08:39 +01:00
Christian Kamm	40dbc78407	concatUrl: Remove manual parsing, add test. #2817	2015-02-13 14:53:55 +01:00
Klaas Freitag	b159018f51	Changelog edited for 1.8.0	2015-02-13 12:54:27 +01:00
Klaas Freitag	17570acab2	Bump version to 1.8.0beta1	2015-02-13 11:57:05 +01:00
Klaas Freitag	4710609cb9	Tests: Removed C++11 Hokuspokus to not confuse and kill elderly compilers.	2015-02-13 11:07:53 +01:00
Klaas Freitag	d297580d26	Tests: Fix compile if NEON is absent.	2015-02-13 10:04:28 +01:00
Jenkins for ownCloud	b50f1d0318	[tx-robot] updated from transifex	2015-02-13 02:18:28 -05:00
Daniel Molkentin	957c9f060d	GeneralSettings: Add OpenSSL version number to about text	2015-02-12 23:23:47 +01:00
Daniel Molkentin	0bf0bab1eb	One more Qt4 compile fix	2015-02-12 22:13:58 +01:00
Olivier Goffart	a7c97388a9	Fix Qt4 build for another error	2015-02-12 20:16:02 +01:00
Olivier Goffart	86c480ee09	Fix Qt4 build	2015-02-12 20:10:31 +01:00
Olivier Goffart	0184a00151	PropagateDirectory: make the code a bit more readable ... Do not call slotSubJobFinished when there is are no sub jobs because no sub jobs were finished. Instead just call a finalize method	2015-02-12 20:00:04 +01:00