* master:
Warning on missing maintenance.
Further pushing out feed updates.
Using @dcramer's excellent getsentry.com for all exceptions. Turning off exception emails.
Further pushing down feed fetches to handle load until db is scaled out.
Scrolling code blocks.
New task servers.
Turning down feed fetches.
If requests.raw won't work, sut fudge it with a StringIO for now.
Further turning down feed fetches until mongo is ready to replicate.
Fixing Facebook image calculation.
Fixing facebook posting.
Moving shared story unread recalc to background task. Will greatly speed up sharing.
Ramping down feed fetching until they can be handled.
Only show time breakdown when > 1 sec.
Fixed API docs for /reader/river_stories
make fabfile.py use requirements.txt
Make sure to send the proper content-type with social feeds
Restore default whitespace to pre/code blocks
Phase 2: switching to using story_hash index instead of compound unique story_feed_id/story_guid index.
document keyboard shortcut to add site/folder
Conflicts:
apps/social/views.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:
Refactoring fabfile for DO
Moving redis servers for real-time.
Increasing feed fetches quite a bit.
More gunicorn servers.
More gunicorn servers.
Upping gunicorn processes.
Hiding 12 option to cut back on number of new premiums.
Bumping up premium refresh rates.
Tasking only popular feeds for now.
Pushing out feed updates until able to handle the giant influx.
* 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
# By Samuel Clay (2) and jv2222 (2)
* master:
Cleaning up API to show multiple params better.
Cleaning up pull request.
Update utils/user_functions.py
Update apps/reader/views.py
* master:
Don't collide stories that are too short to be collided.
Fixing the long broken last update display on story titles header.
Fixing assortment of small bugs.
Allowing anonymous users to use statistics.
Handling previously read stories gracefully on unread count update.
Fixing updating of folder title when renaming. Thanks @afita.
Adding Metroblur to logging.
The 'm' key should only find oldest story, not also mark it read/unread. Typo? Thanks @donmelton.
