15295 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jenkins for ownCloud	f1732d66d6	[tx-robot] updated from transifex	2016-04-08 02:19:09 -04:00
Jenkins for ownCloud	329f512a40	[tx-robot] updated from transifex	2016-04-08 01:15:47 -04:00
Markus Goetz	c64720eac5	Merge pull request #4605 from RealRancor/RealRancor-patch-1 ... Change note to warning in documentation	2016-04-07 15:50:32 +02:00
Klaas Freitag	8f7b833c12	Not Synced Tab: Use tr rather than string concat	2016-04-07 09:18:51 +02:00
Klaas Freitag	48bfcde97d	Merge pull request #4640 from owncloud/numberInProtocolTab ... ProtocolWidget: Show number of non synced files in tab label.	2016-04-07 09:15:06 +02:00
Klaas Freitag	42439490cc	Merge pull request #4645 from owncloud/fix_4633 ... SelectiveSync: Verify if the list could be read from journal. If not handle the error rather than assuming the selective sync list is empty.	2016-04-07 09:14:33 +02:00
Jenkins for ownCloud	4dd8d61e4e	[tx-robot] updated from transifex	2016-04-07 02:19:10 -04:00
Daniel Molkentin	271bea39ff	Update binary subdir	2016-04-06 18:07:35 +02:00
Daniel Molkentin	a0827c5ef2	Remove deleted icons from resource file	2016-04-06 17:59:34 +02:00
Klaas Freitag	058cd33324	Not Synced: Display only the number of not synced items in parathesis. ... This was Jans wish.	2016-04-06 17:53:42 +02:00
Klaas Freitag	e4604b406f	SyncEngine: finalize properly on error with syncjournal	2016-04-06 17:20:48 +02:00
Klaas Freitag	7b1f02fcda	SelectiveSync: Verify if the list could be read from journal. ... If there is a read error from the database while trying to get the list from database, make sure to not behave badly because the list is empty.	2016-04-06 15:01:28 +02:00
Klaas Freitag	52a5234122	Merge pull request #4641 from owncloud/bubbleUpConflicts ... Bubble up conflicts: Show a tray notification on conflicts and show the conflicts in the not-synced list.	2016-04-06 13:45:47 +02:00
Klaas Freitag	4e17dabcb6	Folder: Fixed a couple of plural translation issues.	2016-04-06 12:22:29 +02:00
Jenkins for ownCloud	15bdb7be64	[tx-robot] updated from transifex	2016-04-06 02:19:26 -04:00
Klaas Freitag	9bdc84c6f4	NotificationJobs: Set ocs header to maintain the session. ... This is needed by the server.	2016-04-05 16:52:51 +02:00
Klaas Freitag	252aea25da	ProgressDispatcher: Improve wording about conflicts.	2016-04-05 16:38:18 +02:00
Klaas Freitag	efb0faa14e	Folder: After sync, fire up tray notification if conflicts happened. ... If there were conflicts, users want to have a tray notification that warn about. This will help for #3222	2016-04-05 16:37:54 +02:00
Klaas Freitag	5b40921587	ProtocolWidget: Show number of non synced files in tab label.	2016-04-05 13:57:38 +02:00
Klaas Freitag	7994b3d91a	ProtocolWidget: handle Conflicts as not-synced items	2016-04-05 11:13:12 +02:00
Jenkins for ownCloud	65e740301a	[tx-robot] updated from transifex	2016-04-05 02:19:38 -04:00
Jenkins for ownCloud	f495daf1cf	[tx-robot] updated from transifex	2016-04-05 01:15:46 -04:00
Olivier Goffart	3334067d9f	Merge branch '2.1' ... Conflicts: src/gui/socketapi.cpp	2016-04-04 16:58:49 +02:00
Klaas Freitag	73e2a503d7	NotificationWidget: Some ui refinements.	2016-04-04 12:46:00 +02:00
Klaas Freitag	bc6eebddf4	NotificationWidget: Handle empty message and subject properly.	2016-04-04 12:45:39 +02:00
Olivier Goffart	434d16941b	SyncEngine: fixed restoring files when they are moved in a new directory ... Imagine tgus scenario on a read only share that you move file from one location to a new directory in the read only share. Creating the read only directory fails for permission error. But we should also restore the files that have been moved. IL issue 542	2016-04-04 10:41:12 +02:00
Klaas Freitag	6b0d535120	Merge branch 'notifications'	2016-04-04 10:40:33 +02:00
Jenkins for ownCloud	8b3ea7aa97	[tx-robot] updated from transifex	2016-04-04 02:19:12 -04:00
Jenkins for ownCloud	84ad0d234e	[tx-robot] updated from transifex	2016-04-02 02:19:13 -04:00
Jenkins for ownCloud	87e4370bf4	[tx-robot] updated from transifex	2016-04-01 02:19:45 -04:00
Christian Kamm	fa1bb309ca	Graceful termination of folderwatcher_win #4620	2016-03-31 15:44:42 +02:00
Christian Kamm	e05819370b	Fix invalid read on account removal	2016-03-31 09:00:32 +02:00
Jenkins for ownCloud	d65808b1e1	[tx-robot] updated from transifex	2016-03-31 02:19:30 -04:00
Jocelyn Turcotte	a115f4b9d0	Merge pull request #4625 from owncloud/trivialFixes ... Trivial fixes	2016-03-30 18:41:56 +02:00
Daniel Molkentin	9ea191f63d	Scale correctly with HiDPI displays on Linux with Qt 5.6	2016-03-30 18:25:30 +02:00
Jocelyn Turcotte	17c645ce43	Hide environment variables when running the FinderSync icns script ... This otherwise shows up in the console for each incremental build.	2016-03-30 18:00:22 +02:00
Jocelyn Turcotte	f427955512	Simplify the build of auto tests ... Remove all configure_files: - Move all tests to cpp files - Use the QTEST_MAIN macro instead of a generated main.cpp - Include test*.moc in the cpp to let CMAKE_AUTOMOC call moc - Pass info through add_definitions instead of generating oc_bin.h with them This makes sure that build errors points to the original test source file instead of the generated one in the build directory to be able to jump and fix errors directly from the IDE's error pane.	2016-03-30 18:00:22 +02:00
Markus Goetz	dd8b0c3e4a	Merge pull request #4623 from owncloud/share_menu_icon_osx ... OS X: Use app icon for "Share with ..." Finder menu #4472	2016-03-30 15:53:54 +02:00
Markus Goetz	6c283c7a48	OS X: Use app icon for "Share with ..." Finder menu #4472 ... This works for both plain ownCloud and themed clients.	2016-03-30 15:26:43 +02:00
Christian Kamm	c150350096	SyncFileStatusTracker: Fix compilation with older Qt	2016-03-30 13:42:08 +02:00
Christian Kamm	c35e74d264	Theme: Enable link sharing by default ... Was disabled by accident.	2016-03-30 13:33:12 +02:00
Olivier Goffart	cdbc25ede8	Merge pull request #4615 from owncloud/socketApiRefactor ... Socket API refactor	2016-03-30 13:24:10 +02:00
Jocelyn Turcotte	a0260c29c0	Fix the build on Windows	2016-03-30 12:19:09 +02:00
Jocelyn Turcotte	2c0caf8b75	Fix the SocketApi status of CSYNC_FILE_SILENTLY_EXCLUDED files ... Bring back the hardcoded status logic for excluded files. Since the activity log doesn't even mention those files on purpose, we can't rely on the SyncEngine to notify us about the status of those files.	2016-03-30 12:10:51 +02:00
Jocelyn Turcotte	56064c9366	Fix sibbling directories showing up as warning ... Looking up a/aa while an error is present in a/aab/aaba would return a warning status since a/aa is a substring of a/aab. Fix the issue by checking if the following character is a slash.	2016-03-30 11:22:01 +02:00
ckamm	98995f45e6	Merge pull request #4618 from ckamm/progressui ... Progress layout adjustments	2016-03-30 09:22:27 +02:00
Christian Kamm	5636dc1386	Tooltip updater: Fix compile with Qt4	2016-03-30 09:21:28 +02:00
Jenkins for ownCloud	127291e35d	[tx-robot] updated from transifex	2016-03-30 02:19:15 -04:00
Klaas Freitag	885f8b382f	ActivityWidget: Handle plural properly in translations. ... Even for the case where the number is fixed. Also fix the translators comments.	2016-03-29 18:01:54 +02:00
Klaas Freitag	8166c52f4a	NotificationHandling: Use QByteArray for the verb.	2016-03-29 18:01:49 +02:00