* master: (42 commits)
Switching to new redis sessions db.
If text fails to fetch, tapping the text button should not change the text lock.
Fixing Feed view space bar scrolling bug where story is collapsed.
Adding new space bar behavior to full view as well.
Fixing space bar scrolling in list view.
Adding 'm' keyboard shortcut to toggle read/unread.
Shift+space goes backwards too.
Jumping to next story when scrolling using space bar.
Handling timeout on original page fetch.
Fixing timeout error on PUSH. Also fixing requests error on page importing.
Boosting timeout on analtics cleaning.
Adding fetch original page to msharedstory.
Fixing switching to and from text mode while still in current feed. Now to change river so that it uses text view setting from feed, not folder (unlike web).
Cutting unneccessary logging.
Adding user agents to logging. Reeder, Fever, Superfeedr, Old Reader, IE11.
Adding modern android app user agent in logging.
Switching back to original redis server for sessions while the new sessions server gets monitored.
Adding redis sessions db.
Making text view sticky on ios. Maybe bugs?
Upgrading to redis 2.8.
...
Conflicts:
media/js/newsblur/reader/reader_preferences.js
* master: (29 commits)
Adding new preference for wrapping story content either at 700px or edge of screen.
Bumping Android to v4.2.1.
Work around API change that throws out hidden stories and vends blank pages. (#664)
Fixing duplicate Pocket share extension message.
Don't cache super-small images.
Don't use cache filenames that are impossible to debug.
Fix image prefetch for protocol-hopping redirects.
Keep action replays around until there is less risk of them being needed.
Overhaul and simplify nextUnread search algo. (#640)
Ensure recounts don't get stuck behind story page requests.
Updating push logging message when skipping.
v4.2.0 of android app.
New maintenance message.
Updating fabfile to handle psycopg2/pgbouncer.
Tweak load throb anim speed for stock devices.
Tweak and comment new story list loading indicator.
Move story list loader to correct position. (#582)
New loading-progress animation for story lists. (#582)
Chopping off milliseconds in push delta.
Chopping off milliseconds in push delta.
...
* 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
