merge update

2010-09-30 16:49:20 -07:00 · 2010-09-30 16:49:20 -07:00 · 448c60e5aa
--- a/extensions/firefox-share/src/install.rdf
+++ b/extensions/firefox-share/src/install.rdf
@ -3,8 +3,8 @@
  <Description about="urn:mozilla:install-manifest">
    <em:id>ffshare@mozilla.org</em:id>
    <em:type>2</em:type>
-    <em:name>Firefox Linkdrop Share</em:name>
-    <em:version>0.5</em:version>
+    <em:name>Linkdrop by Mozilla Labs</em:name>
+    <em:version>0.6</em:version>
    <em:creator>Mozilla</em:creator>
    <em:contributor></em:contributor>
    <em:homepageURL>http://linkdrop.mozillamessaging.com/</em:homepageURL>
--- a/tasks.txt
+++ b/tasks.txt
@ -19,8 +19,11 @@ User testing questions:
 Tasks:

 * Consistent Branding! across extension, OAUTH app names, front page, extension ID, etc...  - Bryan (coordinate)
-  "Linkdrop by Mozilla Labs" on main page.
-  "Mozilla Labs Linkdrop" for everything else.
+  * Twitter OAuth - Shane
+  * Facebook Auth - Mark
+  * Extension - Bryan
+  * Front Page - Andy
+  "Linkdrop by Mozilla Labs" for everything.

 * Do a build, preseed the UI so it is fast on first click. And just snap down the       - James
  UI right away instead of waiting for load? Then in that case skip the animation.
--- a/web/frontpage/index.html
+++ b/web/frontpage/index.html
@ -2,7 +2,7 @@
 <html>
 <head>
  <link rel="stylesheet" type="text/css" href="style.css">
-  <title>Linkdrop</title>
+  <title>Linkdrop by Mozilla Labs</title>
  <script type="text/javascript" data-main="index.js" src="../scripts/requireplugins-jquery-1.4.2.js"></script>
 </head>
 <body>