From: Michael Schuster <michael@schuster.ms>
Date: Thu, 19 Dec 2019 21:10:37 +0000 (+0100)
Subject: Show date and time in activity log (fixes issue #1683)
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~466
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b961b683d6ef1d0bb9051e4bc70081dce1a38a3f;p=nextcloud-desktop.git

Show date and time in activity log (fixes issue #1683)

Signed-off-by: Michael Schuster <michael@schuster.ms>
---

diff --git a/src/gui/activitylistmodel.cpp b/src/gui/activitylistmodel.cpp
index b5ee0c725..e43985695 100644
--- a/src/gui/activitylistmodel.cpp
+++ b/src/gui/activitylistmodel.cpp
@@ -130,7 +130,7 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
     case ActivityItemDelegate::AccountRole:
         return a._accName;
     case ActivityItemDelegate::PointInTimeRole:
-        return Utility::timeAgoInWords(a._dateTime);
+        return QString("%1 (%2)").arg(a._dateTime.toLocalTime().toString(Qt::DefaultLocaleShortDate), Utility::timeAgoInWords(a._dateTime.toLocalTime()));
     case ActivityItemDelegate::AccountConnectedRole:
         return (ast && ast->isConnected());
     default: