* master:
Refactoring real-time socketio clientside to fix multiple client updates.
Unread counts only for logged in users.
Conflicts:
media/js/newsblur/reader/reader.js
* master:
Adding task servers to db firewall.
Adding redis cache. Returning favicon server.
Better munin plugins for redis and mongo.
Removing unused redis keys for shared/comments. Dry-run.
Adding read preference to migration.
Migration to create story_hash for missing feeds.
Making a clearer description of slow feeds.
Upping feed fetches, slowing down fetch interval for less active feeds, setting premium expire time to one year from most recent payment date (as opposed to borked payment gap logic), and adding logginf or tasking feeds.
Switching check for HAProxy'ied socket.io to dev instead of www. Thanks @anaconda!
Sync delay in mongodb and updating story hash migration.
Upping feed fetches.
Fix force close when attempting to fetch a user with a null user.id value
Fix force close updating ProfileActivityFragment if no profile response was received
Move creating ImageLoader in NewsBlurApplication to onCreate to ensure that base context has been set and prevent force close
Boosting fetches.
Fix duplicate requirement
Conflicts:
fabfile.py
* master:
Fixing port for real-time over SSL.
Fixing port for real-time over SSL.
Fixing broken CSS line.
Boosting feed fetches.
Premiums users with no active feeds should get all of their feeds activated.
* master:
Fixing Google+ sharing.
64 sites, not 12 sites. Doh!
Adding expires header to icons.
Downgrading from Pillow, which is incompatible with PIL.
Pushing feed history deletion to end of stats collection.
Logging feed fetch deletions.
Fixing missing scipy import missing form PILlow.
Last imports for pillow.
Boosting feed fetches.
Upgrading from PIL to Pillow.
Upgrading from PIL to Pillow.
Upgrading from PIL to Pillow.
Adding cached template loader. Adding new mongodb.
Cutting number of feeds for fetching until mongo is sharded.
Conflicts:
fabfile.py
* master:
Trying out a gunicorn haproxy backend.
Re-upping 12 to 64 free feeds.
Removing Redis state for socket.io. Too many open mongo connections.
Referencing new secret hosts.
Removing hosts.
Adding dev hosts.
Using new secrets repo instead of ignored files.
* master:
Fixing homepage copy.
Using redisstore for socketio.
Forcing reconnection for socket.io.
Upgrading node modules.
Reconnecting to socket.io when disconnected or failing reconnection.
Updating website copy to show /year instead of .
Upgrading socket.io, widening reconnection delay.
Conflicts:
media/js/newsblur/reader/reader.js
* master:
Counting average stories if stories were detected in the last month. This should fix feeds that have long delays but shouldn't.
Fixing maintenance mode message.
Maintenace message.
First half of story hash migration. Setting up unique sparse index, then migration to calculate hashes for every story.
Fixing the timeout on premium setups by doing the scheduling of premium setups in a task, only immediately activating all of a user's feeds.
