16738 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Molkentin	cabeeba7c5	Merge pull request #4582 from owncloud/nsis_uninstall_test ... NSIS: Force uninstall before install #4543	2016-03-18 16:01:41 +01:00
Markus Goetz	6c517638d0	NSIS Silent mode: Force uninstall before install #4543	2016-03-18 16:00:29 +01:00
Klaas Freitag	0e1b9a346d	Fix plural translation handling, remove the superflous arg()	2016-03-18 15:28:00 +01:00
Christian Kamm	03db1894d8	Fix wizardSelectiveSyncDefaultNothing #4581	2016-03-18 13:52:45 +01:00
Christian Kamm	ff4cdc3161	Quota: Change quota path if single folder #4460 ... Since the quota is a per-folder value, this will make the displayed data more useful when a single sync folder is configured. Of course each subfolder could have a different quota again.	2016-03-18 13:34:49 +01:00
Christian Kamm	0febe9b0df	Revert "Utility: Make sure to use UTC timestamp to compare in timeAgoInWords" ... This reverts commit 41b43bf961. Using now in UTC should make no difference, but that assert might trigger...	2016-03-18 13:15:35 +01:00
Christian Kamm	ceb4a23dab	Fix compile with strict C flags	2016-03-18 12:41:57 +01:00
Klaas Freitag	7f22a07312	Notifications: Check if the account is connected before querying. ... Also avoid memory leaks if it is not connected.	2016-03-18 12:29:09 +01:00
Klaas Freitag	328d254f7f	Notifications: Remove "done" notification widgets after fife seconds.	2016-03-18 11:25:14 +01:00
Markus Goetz	15f6e133a5	sqlite: Update to version 3.11.1 ... For OS X and Windows.	2016-03-18 10:17:41 +01:00
Klaas Freitag	0a590b7cbe	Notifications: Give feedback if notifcation request succeeded. ... Also display a time stamp.	2016-03-18 10:02:11 +01:00
Klaas Freitag	f04895a407	Utility: Fix plural translation.	2016-03-18 08:31:13 +01:00
Klaas Freitag	41b43bf961	Utility: Make sure to use UTC timestamp to compare in timeAgoInWords ... This should help to fix the problems we see in #4521	2016-03-18 08:31:03 +01:00
Klaas Freitag	05de710b67	Notifications: Display timestamp of the notification in the widget	2016-03-18 08:21:54 +01:00
Klaas Freitag	f71fdab997	Fix timeAgoInWords	2016-03-18 08:20:23 +01:00
Jenkins for ownCloud	6d8e570420	[tx-robot] updated from transifex	2016-03-18 02:19:21 -04:00
Christian Kamm	d7bd1300a8	Ignores: expand escapes #4568	2016-03-17 14:31:53 +01:00
Christian Kamm	2bba68e059	Handle server timezone data correctly #4521 ... The date we receive from the server is an ISO8601 datetime that includes the offset from UTC. Qt does correctly parse this information and creates the appropriate QDateTime object. Calling setTimeSpec(UTC) will force the timezone offset to 0 and thereby change the referenced point in time to an incorrect one.	2016-03-17 13:04:18 +01:00
Christian Kamm	4b19cdeca0	Propfind: Treat broken XML response as failure #4575 ... Soldiering on with a broken or incomplete response could lead to incorrect sync behavior. Since discovery uses LsCol jobs which already handle errors correctly, this should not have a significant impact.	2016-03-17 11:32:19 +01:00
Olivier Goffart	3d157cbb02	User-Agent: put the actual version string in there ... It contains the build id in addition (cherry picked from commit e0e793fb14a5c32b21db95a63ebf48084621ff4d)	2016-03-17 10:52:55 +01:00
Olivier Goffart	80b5f3f43d	Never overwrite the size from the db when updating the metadata ... the size on the server might be different from the size on the client with certain backend so it should be ignored. (cherry picked from commit 9222db6df9b19a21e1bea5a238d745d96a6385e3)	2016-03-17 10:48:49 +01:00
Olivier Goffart	254361cb87	Shared dialog: move the error label up (#4348)	2016-03-16 18:06:46 +01:00
Klaas Freitag	f7f412007e	Activity: Some documentation and better varialbe names	2016-03-16 16:31:52 +01:00
Klaas Freitag	45c32ec0b1	NotificationWidget: Remove not needed method.	2016-03-16 16:21:20 +01:00
Jenkins for ownCloud	97e323ac3a	[tx-robot] updated from transifex	2016-03-16 02:19:14 -04:00
Christian Kamm	04faee4a0f	Doc: low disk space #4443	2016-03-15 15:20:23 +01:00
Christian Kamm	4900703970	SqlQuery: Write NULL when intended #4548 ... In SQLite bindings are not cleared by sqlite3_reset() calls, so skipping a sqlite3_bind call to create a NULL value doesn't work, instead the previous value will be written. To fix this, I clear all bindings in SqlQuery::reset and make sure to explicitly bind NULL when desired in SqlQuery::bind. To make sure there's no confusion about SqlQuery::reset and sqlite3_reset, I rename our method to reset_and_clear_bindings(). (cherry picked from commit 7bd4f95b8c)	2016-03-15 15:17:35 +01:00
Christian Kamm	7bd4f95b8c	SqlQuery: Write NULL when intended #4548 ... In SQLite bindings are not cleared by sqlite3_reset() calls, so skipping a sqlite3_bind call to create a NULL value doesn't work, instead the previous value will be written. To fix this, I clear all bindings in SqlQuery::reset and make sure to explicitly bind NULL when desired in SqlQuery::bind. To make sure there's no confusion about SqlQuery::reset and sqlite3_reset, I rename our method to reset_and_clear_bindings().	2016-03-15 14:38:31 +01:00
Markus Goetz	ecd44f70de	Submodule: Use https path ... Else I got a git hickup here	2016-03-15 11:55:28 +01:00
Markus Goetz	9d5307d04c	Propagator: On remove move, take size from DB ... Some servers can claim different sizes for on-the-fly protected/encrypted MS Office files during discovery.	2016-03-15 10:28:47 +01:00
Jenkins for ownCloud	6e697bae97	[tx-robot] updated from transifex	2016-03-15 02:19:11 -04:00
Jenkins for ownCloud	366abb5350	[tx-robot] updated from transifex	2016-03-15 01:15:43 -04:00
Markus Goetz	9460aa7f21	SyncEngine: Also emit item in other code path ... Else a user of this library cannot build a complete list of items.	2016-03-14 18:12:07 +01:00
Klaas Freitag	a4dcc2784a	Notification: Fix plural handling for tray message	2016-03-14 16:21:04 +01:00
Klaas Freitag	9a2f1456c5	ocs jobs: Add a define for OCS job success.	2016-03-14 15:41:20 +01:00
Klaas Freitag	9d219a18f3	ActivityListModel: Code cleanups ... based on review feedback.	2016-03-14 15:40:39 +01:00
Klaas Freitag	97f1694f7e	ActivityData: Simplified implementation. ... Use QVariantHash and removed ActivityList object in favour of a typedef	2016-03-14 15:39:07 +01:00
Klaas Freitag	73cd5a9c27	Notifications: Cleaner notification string build	2016-03-14 14:41:21 +01:00
ckamm	25baa995ec	Merge pull request #4532 from ckamm/content-checksum ... Enable content checksums #4375	2016-03-14 09:49:31 +01:00
Jenkins for ownCloud	39a95d3bd5	[tx-robot] updated from transifex	2016-03-14 02:19:15 -04:00
Jenkins for ownCloud	22acc004cc	[tx-robot] updated from transifex	2016-03-12 02:19:25 -05:00
Markus Goetz	6c07f08175	Proxies: Enable ownBrander to force system proxy usage #4458	2016-03-11 16:21:40 +01:00
Markus Goetz	62d4ed8087	Protocol: Show by default instead of server activity #4395	2016-03-11 16:08:56 +01:00
Klaas Freitag	adf9570a92	Notification: Enhance the tray message ... Add the hostname from where the notification comes, as well as the name of the application to the header.	2016-03-11 12:48:31 +01:00
Klaas Freitag	2c2a18af43	Activitiy: Refactor - move classes to their own source files. ... Created a activitydata.h header (only) for the basic data, plus a separate file for the model. Cleans up the widget source.	2016-03-11 11:41:19 +01:00
Klaas Freitag	2d1ab27cb5	Notifications: Refactor - create a notification handler class ... That cleans the ActivityWidget class	2016-03-11 10:48:34 +01:00
Klaas Freitag	903e79a7c4	Notifications: Do a GUI tray notification if new notifciations arrive. ... Show a GUI notification once an hour if no new notifications arrive to not annoy users.	2016-03-11 10:15:28 +01:00
Jenkins for ownCloud	6b8636f79b	[tx-robot] updated from transifex	2016-03-11 02:19:14 -05:00
Klaas Freitag	8a0ce463da	Notifications: Properly delete the notification check job.	2016-03-10 17:46:00 +01:00
Klaas Freitag	7d13a1d8e1	Notifications: Check capabilities if the notifications are enabled ... If not, do not query for them.	2016-03-10 17:46:00 +01:00