* master:
Cleanup.
Gutting dynamodb and just keeping good changes.
Bumped version number.
Modified to remove default URL-encoding for GSON.
Fixed email field not being visible on some smaller screen devices.
Modified CSS to include max-width for divs, overriding inline styles and reduce max-width.
Added padding to share button.
Shifting mgirations for DStory.
Optional backked by dynamodb.
First half of DynamoDB trial, converting stories from mongo to dynamodb. Still needs to be updated/inserted on feed update, and then processed with all MStory uses.
* master: (331 commits)
Adding blurblog permalink to story on blurblog. Adding story slug to permalink. Fixing story guid hashes.
Re-enabling message property for facebook.
Ignoring image for facebook shares.
Commenting out facebook share message until they approve it.
Cleaning up Facebook og description.
Facebook using a website instead of article.
Facebook being a PITA.
Facebook wants ISO8601 datetime format.
Facebook doesn't like going to other URLs.
Facebook doesn't like going to other URLs.
Dumb typo in new facebook og crap.
Using blurblog permalink for new facebook shares.
Fixing Facebook share to use fancy actions.
Adding scroll to comments button to share bar. Thanks @afita.
Turning off microformats for more errors.
Fixing errors in timeouts to show the correct error. Also fixing microformats parsing issue and allow IPv6 URLs in enclosures to be ignored, fixing a bunch of feeds.
Cleaning redis stories for 1% of all feed fetches.
Refreshing feed on fetch.
Fiddling with logging on dupe feeds.
Adding bs facebook assets.
...
Conflicts:
apps/rss_feeds/models.py
settings.py
utils/feed_fetcher.py
* '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:
Updating favicon to include 64x64 icon for Metro.
Marking shared stories as read.
Coering story content into unicode to handle changes.
Fetching more stories.
Moving from Aaron Swartz's html diff lib to lxml's html diff lib. Should fix issues around disappearing content.
Favicon for IE9 and for 32x32.
Trying to repair favicon for ie9 users.
* master:
Adding 1.5X as many stories to the dupe detector. Hope I don't regret this.
Fixing issue when opening feed in Story view but second story gets selected instead of first.
Changing how signin locks on welcome page.
* master:
Typo in s3 icon.
Forcing icon save if the icon is not yet in s3.
Completing feed icon migration to S3.
Segmenting color for load times.
Segmenting color for load times.
Ignoring replica lag if no replicas present.
Ignoring replica lag if no replicas present.
* master:
S3 icons. Untested.
Removing old feed pages from mongo.
Allowing proxy of S3 for original pages to be turned off.
Adding ec2 mdadm setup.
Adding proxy for S3 pages.
Migration for s3 flags for pages + icons.
Migrating to S3 for feed pages.
Cleaning up footer on welcome page.
Retina-izing twitter and github logos.
Adding mongo conf for ec2 (trying out ec2 for some servers).
Fixing a bunch of small exceptions.
Small cleanup on welcome page, fixing social subs urls.
Updating welcome apge to include pricing and a cleaned up footer.
Fixing a couple of update bugs -- story cascading potentially resulting in invalid ids (probably not), and not unique errors on new page fetches.
Conflicts:
apps/rss_feeds/models.py
settings.py
