* 'master' of github.com:samuelclay/NewsBlur:
Adding a new endpoint for updating unread counts that isn't rate limited.
Big new feature: real-time unread counts when reading on multiple devices. Read a story on your iPhone and the feed unread count updates instantaneously on the web.
Cleaning invalid ids.
Cleanign up ec2 firewall rules.
Cleaning up a few things, specifically laying out groundwork for pools.
Registered additional handlers for Firefox.
Using a regex to remove comments.
Disabling the crippling effects of comment stripping.
Handling invalid html when cleaning.
Removing old lxml attr.
Stripping comments from all stories. This fixes the weird bug where '>more>' crap shows up.
Prettifying rss feed for social shared stories blurblog.
Updating android welcome header graphic.
Adding official Android app static page.
Adding new iPhone screenshots. Also rewriting rss feed to include user comments.
Fixing last few bugs (paging for next unread on river blurblog) before submission of v1.6 of iOS app.
Updating saved stories count on save/unsave.
* master: (23 commits)
Changing colors on share buttons to increase sharing.
Adding logging for failed social connects.
Fixing bug in sycning twitter/facebook.
Removing scroll on iPhone social connect, used for new iPhone ftux.
Forcing re-approval on Google Reader import.
Adding feed count to google reader import endpoint.
Adding auto_active flag to reader import, for the iPad.
Adding gflags and fixing facebook website on import.
Vendored OAuth2 library + migration.
OAuth -> OAuth 2! For a better feed import experience.
Handing over url to iPad app during social connect.
Fixing intro and friend's twitter/facebook connect once and for all.
This is seriously the most f'ed typo I've commited. It pulled in extra stories after the last few had loaded using the unread-only filter.
Forcing unread recalcs on feed open. May fix a bunch of mis-calced unreads.
Moving to shared_story dates for unread counts on social subs.
Forcing unread recalcs when necessary.
Fixing mark stories as read when on socialsub.
Changing oldest unread calculation to use share date instead of story date.
Attempting to fix the unread count bug in socialsubs.
Fixing double-cpunting bug and cleaning up unread counts on friend subs.
...
