webapps-demo

Merge lp:~dbarth/webapps-demo/click-packages into lp:webapps-demo

  1. click-packages
  2. Merge into trunk
Proposed by David Barth
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 66
Merged at revision: 29
Proposed branch: lp:~dbarth/webapps-demo/click-packages
Merge into: lp:webapps-demo
Diff against target: 77 lines (+20/-4)
6 files modified
webapp-gmail/manifest.json (+1/-1)
webapp-gmail/unity-webapps-gmail/GMail.user.js (+1/-0)
webapp-gmail/unity-webapps-gmail/manifest.json (+15/-0)
webapp-gmail/webapp-gmail.desktop (+1/-1)
webapp-twitter/manifest.json (+1/-1)
webapp-twitter/webapp-twitter.desktop (+1/-1)
To merge this branch: bzr merge lp:~dbarth/webapps-demo/click-packages
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+190481@code.launchpad.net

Commit message

Fixes a major regression with Gmail.
Helps skip the Android App landing page on the path to twitter signon.

Description of the change

Fixes a major regression with Gmail.
Helps skip the Android App landing page on the path to twitter signon.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-i386-ci/8

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webapps-demo-ci/25/rebuild

review: Approve (continuous-integration)
lp:~dbarth/webapps-demo/click-packages updated
65. By David Barth

gmail, fixed by alex-abreu

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-i386-ci/9

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webapps-demo-ci/26/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

you need a common/ folder at the root level ... a bit artificial but required by unity-webapps-qml, so just add an empty common/ folder at the same top level as unity-webapps-gmail

review: Needs Fixing
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

L48: duplicated --webapp argument, it should read:

webbrowser-app --enable-back-forward --webappModelSearchPath=. --webapp='R01haWwNCg=='

(you don't need the url, it will be pulled from the manifest.json file)

lp:~dbarth/webapps-demo/click-packages updated
66. By David Barth

fix double --webapp and add the common directory to bazaar

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-i386-ci/12

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webapps-demo-ci/29/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'webapp-gmail/common'
2=== modified file 'webapp-gmail/manifest.json'
3--- webapp-gmail/manifest.json 2013-09-26 16:17:53 +0000
4+++ webapp-gmail/manifest.json 2013-10-11 16:04:41 +0000
5@@ -10,6 +10,6 @@
6 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
7 "name": "com.ubuntu.developer.webapps.webapp-gmail",
8 "title": "webapp-gmail",
9- "version": "1.0.5"
10+ "version": "1.0.7"
11 }
12
13
14=== added directory 'webapp-gmail/unity-webapps-gmail'
15=== added file 'webapp-gmail/unity-webapps-gmail/GMail.user.js'
16--- webapp-gmail/unity-webapps-gmail/GMail.user.js 1970-01-01 00:00:00 +0000
17+++ webapp-gmail/unity-webapps-gmail/GMail.user.js 2013-10-11 16:04:41 +0000
18@@ -0,0 +1,1 @@
19+var Unity = window.external.getUnityObject(1);
20
21=== added file 'webapp-gmail/unity-webapps-gmail/manifest.json'
22--- webapp-gmail/unity-webapps-gmail/manifest.json 1970-01-01 00:00:00 +0000
23+++ webapp-gmail/unity-webapps-gmail/manifest.json 2013-10-11 16:04:41 +0000
24@@ -0,0 +1,15 @@
25+{
26+ "includes":["https://mail.google.com/*", "https://accounts.google.*/*"],
27+ "requires":[],
28+ "name":"GMail",
29+ "scripts":["GMail.user.js"],
30+ "maintainer":"Webapps Team <webapps@lists.launchpad.net>",
31+ "license":"GPL-3",
32+ "manifest-version":"1.0",
33+ "integration-version":"2.4.8",
34+ "package-name":"GMail",
35+ "description":"Unity Webapp for GMail",
36+ "icons":{"128":"128/unity-webapps-gmail.png","48":"48/unity-webapps-gmail.png","52":"52/unity-webapps-gmail.png","64":"64/unity-webapps-gmail.png"},
37+ "domain":"mail.google.com",
38+ "homepage":"https://mail.google.com"
39+}
40
41=== modified file 'webapp-gmail/webapp-gmail.desktop'
42--- webapp-gmail/webapp-gmail.desktop 2013-09-26 16:17:53 +0000
43+++ webapp-gmail/webapp-gmail.desktop 2013-10-11 16:04:41 +0000
44@@ -1,7 +1,7 @@
45 [Desktop Entry]
46 Type=Application
47 Terminal=false
48-Exec=webbrowser-app --enable-back-forward --webapp --webappUrlPatterns=https?://mail.google.com/*,https?://accounts.google.*/* https://mail.google.com/
49+Exec=webbrowser-app --enable-back-forward --webappModelSearchPath=. --webapp='R01haWwNCg==' https://mail.google.com/
50 Name=Gmail
51 Icon=./gmail.png
52 X-Ubuntu-Touch=true
53
54=== modified file 'webapp-twitter/manifest.json'
55--- webapp-twitter/manifest.json 2013-09-26 16:17:53 +0000
56+++ webapp-twitter/manifest.json 2013-10-11 16:04:41 +0000
57@@ -10,6 +10,6 @@
58 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
59 "name": "com.ubuntu.developer.webapps.webapp-twitter",
60 "title": "webapp-twitter",
61- "version": "1.0.3"
62+ "version": "1.0.4"
63 }
64
65
66=== modified file 'webapp-twitter/webapp-twitter.desktop'
67--- webapp-twitter/webapp-twitter.desktop 2013-09-26 16:17:53 +0000
68+++ webapp-twitter/webapp-twitter.desktop 2013-10-11 16:04:41 +0000
69@@ -1,7 +1,7 @@
70 [Desktop Entry]
71 Type=Application
72 Terminal=false
73-Exec=webbrowser-app --enable-back-forward --webapp --webappUrlPatterns=https?://mobile.twitter.com/* https://mobile.twitter.com/
74+Exec=webbrowser-app --enable-back-forward --webapp --webappUrlPatterns=https?://mobile.twitter.com/* https://mobile.twitter.com/session/new?bypass_interstitial=true
75 Name=Twitter
76 Icon=./twitter.png
77 X-Ubuntu-Touch=true

Subscribers

People subscribed via source and target branches