* 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:
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.
* master:
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.
New share by facebook.
* master: (107 commits)
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.
Better to push together than to spread apart. Diffing html is hard.
Changing logging colors for social activities.
Delaying Paypal return, fixing privacy css, and adding convenience function.
Adding esc shortcut key in keyboard shortcuts. Also turning on privacy features for public beta testing.
Fixing the missing story titles bug. Turns out it happens when a story title is loaded twice but the reuslting map contains an undefined, which nullifies the rest of the stories. Doh!
Fixing hostname for Firefox content handler.
Adding share info to saved stories.
Revert "Failing marking a story as read in ios now shows an error."
Failing marking a story as read in ios now shows an error.
Consistency b/w ios and web for unsaving a story.
Adding unread counter to All Sites.
Allowing regular users to change read_filter on socialfeeds.
Changing icons on welcome page.
...
* master:
Adding bs facebook assets.
Better to push together than to spread apart. Diffing html is hard.
Changing logging colors for social activities.
* master:
Delaying Paypal return, fixing privacy css, and adding convenience function.
Adding esc shortcut key in keyboard shortcuts. Also turning on privacy features for public beta testing.
* master:
Fixing the missing story titles bug. Turns out it happens when a story title is loaded twice but the reuslting map contains an undefined, which nullifies the rest of the stories. Doh!
Fixing hostname for Firefox content handler.
Adding share info to saved stories.
