* master:
db03 is no longer a db.
Redis to db01.
Logging stripe use.
Paywall on signup.
Extending random holds for feeds while being crushed.
Minimum of MEMORY/256 workers.
Minimum of MEMORY/256 workers.
Bumping gunicorn workers.
Only recount feeds if necessary.
Only recount feeds if necessary.
Conflicts:
media/css/reader.css
* 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.
* master:
If there are no unread stories in a folder, don't request river_stories with no feeds, since that will return all unread stories. Fetch all feeds in folder. Thanks to @afita for pushing this.
Fixing sharing story by email if the story has no feed.
Fixing sharing story by email if the story has no feed.
Adding Tafiti, Windows 8 app, to logs.
1 month max on next fetch.
Conflicts:
media/js/newsblur/reader/reader.js
* master: (1171 commits)
Fixing repeating friend finding check in both intro and friends dialog.
Saving references to visible feeds when reading by folder.
Major refactor of ios feed list. No longer relies on fragile locations dictionary.
No more error messages on deploying new celery/gunicorn. Also adding NUMA cancellation support to mongo db server.
Fixing ios classifiers in river view.
Adding beta search (only titles and authors for now) for staff only.
Updating enterprise distribution ipa.
Fixing crash when mis-counting feeds. Correcting height of font popover on iphone. Adding horizontal bounce to story page control.
Doubling resync likelihood.
Clearing out old read stories for 1% of all feed fetches with new stories.
Adding unread cutoff to redis sync.
Syncing redis keys by feed_id for read stories.
Adding a sync all redis for user stories to be run in a migration.
Turning off deletion of old stories until the db can be prepped.
Adding index for read story deletion.
Deleting old stories.
Typo in delete read stories log.
Typo in delete read stories log.
Typo in delete read stories log.
Deleting old user stories again. This time going out to 5 times the unread bounds.
...
Conflicts:
local_settings.py.template
settings.py