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

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.
12. By Robert Bruce Park

Change const to var.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
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
=== modified file 'TiberiumAlliances.user.js'
--- TiberiumAlliances.user.js 2013-05-03 23:13:37 +0000
+++ TiberiumAlliances.user.js 2013-06-15 00:10:31 +0000
@@ -1,17 +1,17 @@
1// ==UserScript==1// ==UserScript==
2// @include https://alliances.commandandconquer.com/*2// @include https://tiberiumalliances.com/*
3// @include http://alliances.commandandconquer.com/*3// @include http://tiberiumalliances.com/*
4// ==/UserScript==4// ==/UserScript==
55
6// This placeholder gets munged with real data at build time.6// This placeholder gets munged with real data at build time.
7const WebappsGettextDict = JSON.parse(unescape(7var WebappsGettextDict = JSON.parse(unescape(
8 "%7B%22GETTEXT%22%3A%22PLACEHOLDER%22%7D"8 "%7B%22GETTEXT%22%3A%22PLACEHOLDER%22%7D"
9));9));
1010
11window.Unity = external.getUnityObject(1);11window.Unity = external.getUnityObject(1);
1212
13Unity.init({ name: "Command & Conquer Tiberium Alliances",13Unity.init({ name: "Command & Conquer Tiberium Alliances",
14 domain: 'alliances.commandandconquer.com',14 domain: 'tiberiumalliances.com',
15 homepage: 'http://alliances.commandandconquer.com/',15 homepage: 'http://tiberiumalliances.com/',
16 iconUrl: "icon://unity-webapps-tiberiumalliances",16 iconUrl: "icon://unity-webapps-tiberiumalliances",
17 onInit: null });17 onInit: null });
1818
=== added file 'manifest.json'
--- manifest.json 1970-01-01 00:00:00 +0000
+++ manifest.json 2013-06-15 00:10:31 +0000
@@ -0,0 +1,1 @@
1{"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: