summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2016-07-20 15:49:01 +0200
committerRobin Appelman <icewind@owncloud.com>2016-07-20 15:59:00 +0200
commit2ba5785d684d926a59f59ecb64c663268d46c013 (patch)
treebbb10f59c14d5a0ec26ec6a635affcda5ae8c109 /settings/js
parent703794339c97596b5032cbee9d72cd32f6dde806 (diff)
downloadnextcloud-server-2ba5785d684d926a59f59ecb64c663268d46c013.tar.gz
nextcloud-server-2ba5785d684d926a59f59ecb64c663268d46c013.zip
sort tokens
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/authtoken_collection.js2
-rw-r--r--settings/js/authtoken_view.js10
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) {