Merge lp:~dbarth/webbrowser-app/more-ua-overrides into lp:webbrowser-app

Proposed by David Barth
Status: Merged
Approved by: Olivier Tilloy
Approved revision: no longer in the source branch.
Merged at revision: 368
Proposed branch: lp:~dbarth/webbrowser-app/more-ua-overrides
Merge into: lp:webbrowser-app
Diff against target: 85 lines (+24/-18)
1 file modified
src/Ubuntu/Components/Extras/Browser/ua-overrides.js (+24/-18)
To merge this branch: bzr merge lp:~dbarth/webbrowser-app/more-ua-overrides
Reviewer Review Type Date Requested Status
Olivier Tilloy Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+189146@code.launchpad.net

Commit message

UA overrides for google domains, youtube, twitter. Also login.ubuntu.com

Description of the change

UA overrides for google domains, youtube, twitter.

Also, an embarrassing tweak to be able to login on U1 :/
See https://bugs.launchpad.net/ubuntu/+source/ubuntu-keyboard/+bug/1233207

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
364. By Olivier Tilloy

Live bookmarking functionality in the activity view.

Known shortcoming: in the activity view, one should be allowed to bookmark a domain that contains only one page. This is currently not the case, it will be addressed separately.

Approved by Bill Filler, PS Jenkins bot, G√ľnter Schwann.

365. By Robert Bruce Park

Enable hardening, and fix some lintian warnings.

Approved by PS Jenkins bot, Robert Bruce Park.

366. By Olivier Tilloy

Expose a single contextual menu for both images and hyperlinks. Fixes: https://bugs.launchpad.net/bugs/1233282.

Approved by PS Jenkins bot, Bill Filler, Ugo Riboni.

367. By Launchpad Translations on behalf of phablet-team

Launchpad automatic translations update.

Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks good.

review: Approve
368. By David Barth

UA overrides for google domains, youtube, twitter. Also login.ubuntu.com. Fixes: https://bugs.launchpad.net/bugs/1233270.

Approved by Olivier Tilloy, PS Jenkins bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/Extras/Browser/ua-overrides.js'
2--- src/Ubuntu/Components/Extras/Browser/ua-overrides.js 2013-09-26 13:24:27 +0000
3+++ src/Ubuntu/Components/Extras/Browser/ua-overrides.js 2013-10-03 17:40:18 +0000
4@@ -37,9 +37,30 @@
5 // Android as a reference.
6
7 var overrides = {
8- "mail.google.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
9- "google.com": ["Mobile", "Android; Mobile"],
10- "youtube.com": ["Mobile", "Android; Mobile"],
11+ "google.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
12+ "google.co.in": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
13+ "google.de": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
14+ "google.co.uk": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
15+ "google.fr": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
16+ "google.com.br": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
17+ "google.co.jp": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
18+ "google.com.hk": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
19+ "google.ru": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
20+ "google.it": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
21+ "google.es": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
22+ "google.com.mx": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
23+ "google.ca": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
24+ "google.com.tr": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
25+ "google.com.au": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
26+ "google.pl": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
27+
28+ "m.youtube.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
29+
30+ "mobile.twitter.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
31+
32+ // while this issue gets resolved (https://bugs.launchpad.net/ubuntu/+source/ubuntu-keyboard/+bug/1233207)
33+ "login.ubuntu.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
34+
35 "yahoo.com": ["Mobile", "Android; Mobile"],
36 "baidu.com": ["Mobile", "Android; Mobile"],
37 "qq.com": [/WebKit\/[.0-9]*/, "Apple$& Mobile"],
38@@ -47,33 +68,21 @@
39 "linkedin.com": ["Mobile", "Android; Mobile"],
40 "blogspot.com": ["Mobile", "Android; Mobile"],
41 "taobao.com": ["Mobile", "Android; Mobile"],
42- "google.co.in": ["Mobile", "Android; Mobile"],
43 "bing.com": ["Mobile", "Android; Mobile"],
44 "yahoo.co.jp": ["Ubuntu", "Linux; Android 4; Galaxy Build/"],
45 "yandex.ru": ["Mobile", "Android; Mobile"],
46 "sina.com.cn": ["Mobile", "Android; Mobile"],
47 "ebay.com": ["Mobile", "Android; Mobile"],
48- "google.de": ["Mobile", "Android; Mobile"],
49 "tumblr.com": ["Mobile", "Android; Mobile"],
50- "google.co.uk": ["Mobile", "Android; Mobile"],
51 "msn.com": ["Mobile", "Android; Mobile"],
52- "google.fr": ["Mobile", "Android; Mobile"],
53 "mail.ru": ["Ubuntu", "Linux; Android 4; Galaxy Build/"],
54- "google.com.br": ["Mobile", "Android; Mobile"],
55- "google.co.jp": ["Mobile", "Android; Mobile"],
56 "hao123.com": ["Mobile", "Android; Mobile"],
57 "ask.com": ["Mobile", "Android; Mobile"],
58- "google.com.hk": ["Mobile", "Android; Mobile"],
59- "google.ru": ["Mobile", "Android; Mobile"],
60 "blogger.com": ["Mobile", "Android; Mobile"],
61 "imdb.com": ["Mobile", "Android; Mobile"],
62- "google.it": ["Mobile", "Android; Mobile"],
63- "google.es": ["Mobile", "Android; Mobile"],
64 "amazon.co.jp": ["Mobile", "Android; Mobile"],
65 "tmall.com": ["Mobile", "Android; Mobile"],
66 "fc2.com": ["Mobile", "Android; Mobile"],
67- "google.com.mx": ["Mobile", "Android; Mobile"],
68- "google.ca": ["Mobile", "Android; Mobile"],
69 "soso.com": ["Mobile", "Android; Mobile"],
70 "delta-search.com": ["Mobile", "Android; Mobile"],
71 "odnoklassniki.ru": ["Mobile", "Android; Mobile"],
72@@ -83,13 +92,10 @@
73 "blogspot.in": ["Mobile", "Android; Mobile"],
74 "ifeng.com": ["Mobile", "Android; Mobile"],
75 "360.cn": ["Mobile", "Android; Mobile"],
76- "google.com.tr": ["Mobile", "Android; Mobile"],
77- "google.com.au": ["Mobile", "Android; Mobile"],
78 "youku.com": ["Mobile", "Android; Mobile"],
79 "ebay.de": ["Mobile", "Android; Mobile"],
80 "uol.com.br": ["Mobile", "Android; Mobile"],
81 "aol.com": ["Mobile", "Android; Mobile"],
82- "google.pl": ["Mobile", "Android; Mobile"],
83 "alipay.com": ["Mobile", "Android; Mobile"],
84 "dailymotion.com": ["Mobile", "Android; Mobile Safari"],
85 "amazon.co.uk": ["Mobile", "Android; Mobile"],

Subscribers

People subscribed via source and target branches

to status/vote changes: