Samuel Clay 408cb7e801 Merge branch 'master' into social ... * master: Fixing starred stories from not loading past the second page due to a missing flag reset. Fixing user-found bug around tooltips continuing to show if the original dom element (and the reference to the tooltip) are destroyed too early, leaving a tooltip floating in the air. Geometrically delaying the fetching of bad feeds, while they're still somewhat fresh. Fixing error codes on statistics. Also fixing simple error on invalid feed. Update media/js/newsblur/reader.js Conflicts: media/js/newsblur/reader/reader.js		2012-02-24 13:01:48 -08:00
..
mobile	Including feeds that a user isn't subscribed to in social feeds. Also adding a new url for feed icons.	2012-01-26 18:59:40 -08:00
newsblur	Merge branch 'master' into social	2012-02-24 13:01:48 -08:00
vendor	Working social profile. Needs a refactor to get all user profiles in a centralized dictionary in all requests to allow for pulling of specific info in later dialogs. Also updated underscore and fixed related issues.	2012-02-22 09:11:35 -08:00