From f9f8fdc3000042ba5b4504d91870dc9a32ef25eb Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 16 May 2012 01:00:22 -0700 Subject: Squashed master into dom-architecture Signed-off-by: Valerio Virgillito --- js/document/templates/banner/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/document/templates/banner/package.json') diff --git a/js/document/templates/banner/package.json b/js/document/templates/banner/package.json index c8bc02fb..d1e839dc 100755 --- a/js/document/templates/banner/package.json +++ b/js/document/templates/banner/package.json @@ -3,6 +3,7 @@ "lib": "" }, "mappings": { - "montage": "../../../../node_modules/montage/" + "montage": "../../../../node_modules/montage/", + "montage-google": "../../../../node_modules/montage-google/" } } \ No newline at end of file -- cgit v1.2.3 From 6ce2f2a5af1bc66d8dbec04abfae2e07f43afcfe Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 17 May 2012 11:22:03 -0700 Subject: Fixed chrome preview for banner templates. Signed-off-by: Nivesh Rajbhandari --- js/document/templates/banner/package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'js/document/templates/banner/package.json') diff --git a/js/document/templates/banner/package.json b/js/document/templates/banner/package.json index d1e839dc..4f36090a 100755 --- a/js/document/templates/banner/package.json +++ b/js/document/templates/banner/package.json @@ -4,6 +4,7 @@ }, "mappings": { "montage": "../../../../node_modules/montage/", + "tools": "../../../../node_modules/tools/", "montage-google": "../../../../node_modules/montage-google/" } } \ No newline at end of file -- cgit v1.2.3 From e713d437a3918b9e417d1a0bc9f11275fc9e6634 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 17 May 2012 12:16:43 -0700 Subject: Sharing app data in banner and html templates Syncing the files to avoid duplicates and ensure consistency. --- js/document/templates/banner/package.json | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100755 js/document/templates/banner/package.json (limited to 'js/document/templates/banner/package.json') diff --git a/js/document/templates/banner/package.json b/js/document/templates/banner/package.json deleted file mode 100755 index 4f36090a..00000000 --- a/js/document/templates/banner/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "directories": { - "lib": "" - }, - "mappings": { - "montage": "../../../../node_modules/montage/", - "tools": "../../../../node_modules/tools/", - "montage-google": "../../../../node_modules/montage-google/" - } -} \ No newline at end of file -- cgit v1.2.3