TiberiumAlliances WebApp

Merge lp:~robru/unity-webapps-tiberiumalliances/add-manifest into lp:unity-webapps-tiberiumalliances

  1. add-manifest
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 12
Merged at revision: 11
Proposed branch: lp:~robru/unity-webapps-tiberiumalliances/add-manifest
Merge into: lp:unity-webapps-tiberiumalliances
Diff against target: 32 lines (+6/-5)
2 files modified
TiberiumAlliances.user.js (+5/-5)
manifest.json (+1/-0)
To merge this branch: bzr merge lp:~robru/unity-webapps-tiberiumalliances/add-manifest
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
WebApps Pending
Review via email: mp+169564@code.launchpad.net

Commit message

Add missing manifest.json

To post a comment you must log in.
lp:~robru/unity-webapps-tiberiumalliances/add-manifest updated
12. By Robert Bruce Park

Change const to var.

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

FAILED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/unity-webapps-tiberiumalliances-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-tiberiumalliances-saucy-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-tiberiumalliances-saucy-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-tiberiumalliances-ci/1/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'TiberiumAlliances.user.js'
2--- TiberiumAlliances.user.js 2013-05-03 23:13:37 +0000
3+++ TiberiumAlliances.user.js 2013-06-15 00:10:31 +0000
4@@ -1,17 +1,17 @@
5 // ==UserScript==
6-// @include https://alliances.commandandconquer.com/*
7-// @include http://alliances.commandandconquer.com/*
8+// @include https://tiberiumalliances.com/*
9+// @include http://tiberiumalliances.com/*
10 // ==/UserScript==
11
12 // This placeholder gets munged with real data at build time.
13-const WebappsGettextDict = JSON.parse(unescape(
14+var WebappsGettextDict = JSON.parse(unescape(
15 "%7B%22GETTEXT%22%3A%22PLACEHOLDER%22%7D"
16 ));
17
18 window.Unity = external.getUnityObject(1);
19
20 Unity.init({ name: "Command & Conquer Tiberium Alliances",
21- domain: 'alliances.commandandconquer.com',
22- homepage: 'http://alliances.commandandconquer.com/',
23+ domain: 'tiberiumalliances.com',
24+ homepage: 'http://tiberiumalliances.com/',
25 iconUrl: "icon://unity-webapps-tiberiumalliances",
26 onInit: null });
27
28=== added file 'manifest.json'
29--- manifest.json 1970-01-01 00:00:00 +0000
30+++ manifest.json 2013-06-15 00:10:31 +0000
31@@ -0,0 +1,1 @@
32+{"includes":["https://tiberiumalliances.com/*","http://tiberiumalliances.com/*"],"requires":[],"name":"TiberiumAlliances","scripts":["TiberiumAlliances.user.js"],"maintainer":"Webapps Team <webapps@lists.launchpad.net>","manifest-version":"1.0","integration-version":"2.4","package-name":"TiberiumAlliances","icons":{"128":"128/unity-webapps-tiberiumalliances.png","64":"64/unity-webapps-tiberiumalliances.png"},"domain":"tiberiumalliances.com","homepage":"http://tiberiumalliances.com","license":"GPL-3"}

Subscribers

People subscribed via source and target branches

to all changes: