* master:
Locking the mouse indicator by default.
Grabbing forced refresh feeds.
Fixing pgsql backup.
Fixing autologin with no next param.
Bootstrapping redis sessions.
Using redis pipeline for speeeeed in django db sessions -> redis sessions.
Adding redis session pool and migration script for sessions.
Redis session db.
* master:
Using user's username on signup if no password.
Using user's username on signup if no password.
Fixing passwords if left blank.
Patching Django 1.5 to handle underscores in subdomains.
Allowed hosts
Allowed hosts
If not active subs, turn off real-time.
If not active subs, turn off real-time.
Skipping real-time fetch for non-premium active feeds.
Upgrading django 1.5 manage.py.
Upgrade to django 1.5 script. Also handling story lookups with objectids.
Updated Django to always use the latest 1.5 version. Updated django-redis-session to latest version.
Moving HAProxy's config to secrets so I can set a password.
Allowing_hosts for django 1.5.
Upgrading django from 1.3 to 1.5.
Keep Raven from making settings puke.
Added django-redis-sessions to requirements.
Added a check for testing the email address provided during registration and throwing an error if the email address is already associated with an existing account.
Adding revsys fab command.
Froze requirements to make installation a bit easier.
Conflicts:
templates/reader/dashboard.xhtml
templates/social/social_page.xhtml
* social:
Fixing mail tempaltes to center everything. Mac OS X 10.8 broke centering in the new Mail.app.
Showing better error messages for front-end users.
Better time breakdowns on site loading.
Slightly altering styling on feed chooser hamburgers.
Rewriting new user email. Animating hamburgers.
Adding images to all footer links.
Conflicts:
apps/reader/views.py
* master:
New preference: delay to mark a story as read.
Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion.
Conflicts:
media/css/reader.css
media/js/newsblur/reader/reader.js
media/js/newsblur/reader/reader_keyboard.js