* 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:
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:
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
* master: (23 commits)
Fixing trainer for stories in social feeds.
Fixing small bug in story titles header now showing socialsubs correctly.
Fixing headers for Everything river and river blurblog.
Massive refactor around feedbar, brought on by @afita, in order to give Folders a menu in the story titles header (and then make the mark as read button work on folders in the header.)
Updating story position in closed story titles when pane is re-opened. Thanks to @afita for the bug.
Updating to altest jQuery layout.
Adding folder story counts to content pane. Thanks to @afita for the suggestion.
Fixing activities bug when the user is unknown and there is no source/with_user.
Calculating correct page fetch timing offset (if it was a 304).
Adding server name and feed code to analytics.
Turning analytics logging back on.
Temporarily commenting out analytics to see if they cure the slow down.
Shortening names on analytics for improved space saving.
Adding new analytics collections to keep track of page loads and feed fetches. Need to start aggregating before I can tell how useful this data will be.
Adding new analytics collections to keep track of page loads and feed fetches. Need to start aggregating before I can tell how useful this data will be.
Adding VentureBeat article to press page.
Adding order/read_filter to api. Also adding river blurblog.
Fixing right click on folders.
Fixing bug where publisher-disabled original pages were not properly disabled.
Fixing bug where publisher-disabled original pages were not properly disabled.
...
Conflicts:
utils/feed_fetcher.py
* 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.
...
