From eb3410322ec8b94a7fa60e090d15a2fd879201fa Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Jul 2016 14:13:23 +0200 Subject: improve matching safari user agent --- settings/js/authtoken_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index 2ebedb4131c..cef5dc9f7bb 100644 --- a/settings/js/authtoken_view.js +++ b/settings/js/authtoken_view.js @@ -114,7 +114,7 @@ // Chrome User Agent from https://developer.chrome.com/multidevice/user-agent chrome: /^Mozilla\/5\.0 \([^)]*(Windows|OS X|Linux)[^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Chrome\/(\d+)[0-9.]+ (?:Mobile Safari|Safari)\/[0-9.]+$/, // Safari User Agent from http://www.useragentstring.com/pages/Safari/ - safari: /^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/([0-9]+)[0-9.]+ Safari\/[0-9.A-Z]+$/, + safari: /^Mozilla\/5\.0 \([^)]*(Windows|OS X)[^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\)(?: Version\/([0-9]+)[0-9.]+)? Safari\/[0-9.A-Z]+$/, // Android Chrome user agent: https://developers.google.com/chrome/mobile/docs/user-agent androidChrome: /Android.*(?:; (.*) Build\/).*Chrome\/(\d+)[0-9.]+/, iphone: / *CPU +iPhone +OS +(\d+)_\d+ +like +Mac +OS +X */, -- cgit v1.2.3 From 66db0f3155d57e6ceb4865d06bea4d094ee104da Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Jul 2016 14:25:03 +0200 Subject: Change "recent activity" to "last activity" --- settings/templates/personal.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/templates/personal.php b/settings/templates/personal.php index e3164eb5b98..4f580e41287 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -172,7 +172,7 @@ if($_['passwordChangeSupported']) { t('Device'));?> - t('Recent activity'));?> + t('Last activity'));?> @@ -188,7 +188,7 @@ if($_['passwordChangeSupported']) { t('Name'));?> - t('Recent activity'));?> + t('Last activity'));?> -- cgit v1.2.3 From 341948155d661407289e1ac6aa0275d377217d41 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Jul 2016 14:25:23 +0200 Subject: fix apppassword table with only a few entries being streched --- settings/css/settings.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/css/settings.css b/settings/css/settings.css index a190cd91b00..50280ef2a0a 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -102,7 +102,7 @@ table.nostyle td { padding: 0.2em 0; } #sessions table, #apppasswords table { width: 100%; - min-height: 150px; + min-height: 50px; padding-top: 5px; max-width: 580px; } -- cgit v1.2.3 From 703794339c97596b5032cbee9d72cd32f6dde806 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Jul 2016 14:26:03 +0200 Subject: right allign last activity --- settings/css/settings.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/settings/css/settings.css b/settings/css/settings.css index 50280ef2a0a..4cd85598443 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -125,6 +125,11 @@ table.nostyle td { padding: 0.2em 0; } white-space: nowrap; overflow: hidden; } + +#sessions tr *:nth-child(2), +#apppasswords tr *:nth-child(2) { + text-align: right; +} #sessions .token-list td a.icon-delete, #apppasswords .token-list td a.icon-delete { display: block; -- cgit v1.2.3 From 2ba5785d684d926a59f59ecb64c663268d46c013 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Jul 2016 15:49:01 +0200 Subject: sort tokens --- settings/js/authtoken_collection.js | 2 +- settings/js/authtoken_view.js | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/settings/js/authtoken_collection.js b/settings/js/authtoken_collection.js index ab7f7d5804a..d1ffc25a599 100644 --- a/settings/js/authtoken_collection.js +++ b/settings/js/authtoken_collection.js @@ -39,7 +39,7 @@ comparator: function (t1, t2) { var ts1 = parseInt(t1.get('lastActivity'), 10); var ts2 = parseInt(t2.get('lastActivity'), 10); - return ts1 < ts2; + return ts2 - ts1; }, tokenType: null, diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index cef5dc9f7bb..354173341bc 100644 --- a/settings/js/authtoken_view.js +++ b/settings/js/authtoken_view.js @@ -121,7 +121,11 @@ iosClient: /^Mozilla\/5\.0 \(iOS\) ownCloud\-iOS.*$/, androidClient:/^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/, // DAVdroid/1.2 (2016/07/03; dav4android; okhttp3) Android/6.0.1 - davDroid: /DAVdroid\/([0-9.]+)/ + davDroid: /DAVdroid\/([0-9.]+)/, + // Mozilla/5.0 (U; Linux; Maemo; Jolla; Sailfish; like Android 4.3) AppleWebKit/538.1 (KHTML, like Gecko) WebPirate/2.0 like Mobile Safari/538.1 (compatible) + webPirate: /(Sailfish).*WebPirate\/(\d+)/, + // Mozilla/5.0 (Maemo; Linux; U; Jolla; Sailfish; Mobile; rv:31.0) Gecko/31.0 Firefox/31.0 SailfishBrowser/1.0 + sailfishBrowser: /(Sailfish).*SailfishBrowser\/(\d+)/ }; var nameMap = { ie: t('setting', 'Internet Explorer'), @@ -133,7 +137,9 @@ iphone: t('setting', 'iPhone'), iosClient: t('setting', 'iOS Client'), androidClient: t('setting', 'Android Client'), - davDroid: 'DAVdroid' + davDroid: 'DAVdroid', + webPirate: 'WebPirate', + sailfishBrowser: 'SailfishBrowser' }; if (matches) { -- cgit v1.2.3