diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2016-11-29 00:00:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 00:00:53 +0100 |
| commit | ee0bb6e17b0105655af5364305f74f394ec0632c (patch) | |
| tree | 0461ef72a0a641880c9bce2b51cf3380a0d1efd6 | |
| parent | 8a9343a7096c818edf8bf052ddf3df808a31d9dc (diff) | |
| parent | 9dead382ef32744df3c68c88ad1a2f586930cdc0 (diff) | |
| download | nextcloud-server-ee0bb6e17b0105655af5364305f74f394ec0632c.tar.gz nextcloud-server-ee0bb6e17b0105655af5364305f74f394ec0632c.zip | |
Merge pull request #2386 from nextcloud/fix-iphone-and-ipad
Fix Regex for iPhone and add iPad
| -rw-r--r-- | settings/js/authtoken_view.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index 518eb671b08..0899b723b2a 100644 --- a/settings/js/authtoken_view.js +++ b/settings/js/authtoken_view.js @@ -129,7 +129,8 @@ 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 */, + iphone: / *CPU +iPhone +OS +([0-9]+)_(?:[0-9_])+ +like +Mac +OS +X */, + ipad: /\(iPad\; *CPU +OS +([0-9]+)_(?:[0-9_])+ +like +Mac +OS +X */, 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 @@ -146,7 +147,8 @@ chrome: t('setting', 'Google Chrome'), safari: t('setting', 'Safari'), androidChrome: t('setting', 'Google Chrome for Android'), - iphone: t('setting', 'iPhone'), + iphone: t('setting', 'iPhone iOS'), + ipad: t('setting', 'iPad iOS'), iosClient: t('setting', 'iOS Client'), androidClient: t('setting', 'Android Client'), davDroid: 'DAVdroid', |