Merge branch 'master' into social

* master:
  Adding press story.
  Fixing forgot password links by blanking out old passwords.
  Document the key to toggle read/unread

apps/profile/models.py

@@ -163,6 +163,9 @@ NewsBlur""" % {'user': self.user.username, 'feeds': subs.count()}
         msg.attach_alternative(html, "text/html")
         msg.send(fail_silently=True)
         
+        user.set_password('')
+        user.save()
+        
         logging.user(self.user, "~BB~FM~SBSending email for forgotten password: %s" % self.user.email)
         
     def autologin_url(self, next=None):

media/js/newsblur/reader/reader_keyboard.js

@@ -203,6 +203,16 @@ NEWSBLUR.ReaderKeyboard.prototype = {
                     'm'
                 ])
               ])
+            ]),
+            $.make('div', { className: 'NB-keyboard-group' }, [
+              $.make('div', { className: 'NB-keyboard-shortcut' }, [
+                $.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'Toggle read/unread'),
+                $.make('div', { className: 'NB-keyboard-shortcut-key' }, [
+                    'shift',
+                    $.make('span', '+'),
+                    'u'
+                ])
+              ])
             ])
         ]);
     },
@@ -259,4 +269,4 @@ NEWSBLUR.ReaderKeyboard.prototype = {
         });
     }
     
-};
+};

templates/static/press.xhtml

@@ -171,6 +171,14 @@
             Aug 24, 2010
           </span>
         </li>
+        <li>
+          <a href="http://www.baixaki.com.br/download/newsblur.htm">NewsBlur: Visualize página inteiras em um completo leitor de RSS integrado ao Chrome.</a>
+          <span class="NB-press-publisher">
+            <img src="http://www.baixaki.com.br/favicon.ico">
+            Baixaki</span>, 
+          <span class="NB-press-author">Gratuito</span>, 
+          <span class="NB-press-date">Sept 26, 2011</span>
+        </li>
         <li>
           <a href="http://tecnologia7.net/servicios-web/newsblur-lector-feeds-rss-google-reader/?utm_source=feedburner&utm_medium=twitter&utm_campaign=Feed%3A+Tecnologia7+%28Tecnolog%C3%ADa+7%29">
             NewsBlur lector de feeds como Google Reader