Merge lp:~osomon/webbrowser-app/hangouts-ua-overrides into lp:webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1393
Merged at revision: 1422
Proposed branch: lp:~osomon/webbrowser-app/hangouts-ua-overrides
Merge into: lp:webbrowser-app
Diff against target: 34 lines (+11/-1)
2 files modified
src/Ubuntu/Web/ua-overrides-desktop.js (+5/-0)
src/Ubuntu/Web/ua-overrides-mobile.js (+6/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/hangouts-ua-overrides
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
system-apps-ci-bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+290959@code.launchpad.net

Commit message

Add UA overrides for google hangouts to work on desktop, tablet and phone.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Web/ua-overrides-desktop.js'
2--- src/Ubuntu/Web/ua-overrides-desktop.js 2016-03-21 10:29:07 +0000
3+++ src/Ubuntu/Web/ua-overrides-desktop.js 2016-04-05 09:04:02 +0000
4@@ -24,4 +24,9 @@
5 ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/1412880
6 ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/1503506, http://pad.lv/1551649
7 ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/47.0.2526.106 Safari/537.36"], // http://pad.lv/1452616
8+
9+ // Google hangouts (https://launchpad.net/bugs/1565055)
10+ ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/49.0.2623.87 Safari/537.36"],
11+ ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/49.0.2623.87 Safari/537.36"],
12+ ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/49.0.2623.87 Safari/537.36"],
13 ];
14
15=== modified file 'src/Ubuntu/Web/ua-overrides-mobile.js'
16--- src/Ubuntu/Web/ua-overrides-mobile.js 2015-09-28 15:23:56 +0000
17+++ src/Ubuntu/Web/ua-overrides-mobile.js 2016-04-05 09:04:02 +0000
18@@ -1,5 +1,5 @@
19 /*
20- * Copyright 2014-2015 Canonical Ltd.
21+ * Copyright 2014-2016 Canonical Ltd.
22 *
23 * This file is part of webbrowser-app.
24 *
25@@ -24,4 +24,9 @@
26 ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/1284158
27 ["^https?:\/\/(\w+\.)*hsbc\.com\.br\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/1380657
28 ["^http:\/\/(\w+\.)*espn\.(go\.)?com\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/1316259
29+
30+ // Google hangouts (https://launchpad.net/bugs/1565055)
31+ ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/49.0.2623.87 Mobile Safari/537.36"],
32+ ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/49.0.2623.87 Mobile Safari/537.36"],
33+ ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/49.0.2623.87 Mobile Safari/537.36"],
34 ];

Subscribers

People subscribed via source and target branches

to status/vote changes: