summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-22 11:15:49 +0100
committerGitHub <noreply@github.com>2018-11-22 11:15:49 +0100
commit0534bcfb6aef515d3285ae883be2d63e42b6a306 (patch)
tree0879289dbe2d78f55754d4aafe331f9c56a5a310 /settings
parentede53e06c1cdc2744ecb16641210862398adb961 (diff)
parentd94fce8d3ad8e91cd2110dce4d6a6134077005aa (diff)
downloadnextcloud-server-0534bcfb6aef515d3285ae883be2d63e42b6a306.tar.gz
nextcloud-server-0534bcfb6aef515d3285ae883be2d63e42b6a306.zip
Merge pull request #12485 from nextcloud/nextcloud-talk-sessions-format
Format Nextcloud Talk clients sessions.
Diffstat (limited to 'settings')
-rw-r--r--settings/js/authtoken_view.js14
1 files changed, 10 insertions, 4 deletions
diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js
index 0aa67bad900..9ad07e9cca5 100644
--- a/settings/js/authtoken_view.js
+++ b/settings/js/authtoken_view.js
@@ -103,6 +103,8 @@
ipad: /\(iPad\; *CPU +OS +([0-9]+)_(?:[0-9_])+ +like +Mac +OS +X */,
iosClient: /^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/,
androidClient:/^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/,
+ iosTalkClient: /^Mozilla\/5\.0 \(iOS\) Nextcloud\-Talk.*$/,
+ androidTalkClient:/^Mozilla\/5\.0 \(Android\) Nextcloud\-Talk.*$/,
// DAVdroid/1.2 (2016/07/03; dav4android; okhttp3) Android/6.0.1
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)
@@ -117,10 +119,12 @@
chrome: t('setting', 'Google Chrome'),
safari: t('setting', 'Safari'),
androidChrome: t('setting', 'Google Chrome for Android'),
- iphone: t('setting', 'iPhone iOS'),
- ipad: t('setting', 'iPad iOS'),
- iosClient: t('setting', 'iOS Client'),
- androidClient: t('setting', 'Android Client'),
+ iphone: t('setting', 'iPhone'),
+ ipad: t('setting', 'iPad'),
+ iosClient: t('setting', 'Nextcloud iOS app'),
+ androidClient: t('setting', 'Nextcloud Android app'),
+ iosTalkClient: t('setting', 'Nextcloud Talk for iOS'),
+ androidTalkClient: t('setting', 'Nextcloud Talk for Android'),
davDroid: 'DAVdroid',
webPirate: 'WebPirate',
sailfishBrowser: 'SailfishBrowser'
@@ -137,6 +141,8 @@
ipad: 'icon-tablet',
iosClient: 'icon-phone',
androidClient: 'icon-phone',
+ iosTalkClient: 'icon-phone',
+ androidTalkClient: 'icon-phone',
davDroid: 'icon-phone',
webPirate: 'icon-link',
sailfishBrowser: 'icon-link'