* master:
Rejiggering autocomplete to only include > 10 subs.
Have RegisterProgressFragment finished via noHistory Manifest option rather than hackish finish with Fragment. Improve comments
Fix registration regression bug caused by #151
Fix for #159 force close during add feed (auto complete) now that is is enabled again
Remove log call from DeleteFeedFragment
Fix#140. Delete feed now works and confirmation dialog has been added.
Fix issue where selection within stories was hidden
* 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:
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
