* master: (81 commits)
Adding font size choices to web preferences.
Closing #66 with both integration of #68 and using the same fonts. Users can add an optional class if they want these other convenient fonts. Also using a few fonts as backups for non-Mac users.
Fix default theming hook
Add multiple targeted font stacks
Fixing #75: shared stories should use story permalink, not story guid. Doh. Thanks @denubis!
Categorizing preferences. Adding window title count back in.
Adding email lookup to forgot password flow.
Adding email lookup to forgot password flow.
Fixing typo in logging.
Fixing autocomplete behavior on add dialog.
Adding broken search for feeds.
Logging
Switching to guid-based read story counts from range based counts. Let's see what this screws up.
Everybody gets unread count in title.
Backporting collections.Counter to python2.6
Fixing broken reply interaction with links.
Prototype of a dupe checker using real-time update times to figure out which feeds are the same. Last time I walked down this road I got run over.
Adding delete user flow. About time, since I'm sick of doing this myself.
Deractivating premiums.
Adding a lock for the intelligence slider for focus stories. If the user selects focus and there are actually focus stories, lock it for the future when there are no unread focus stories.
...
Conflicts:
fabfile.py
* 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:
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: (31 commits)
Adding delay to showing login when moving from reader.
Updating welcome email to point to iPad app.
Correctly handling URL loading cases and hiding/showing sidebar correctly in welcome splash screen.
Showing signup button in tryout view. Splash apge hides when in tryout mode. Still need to preload feed view and show feed list on url load.
Finishing up tryout. Still need Sign Up callout.
Deleting unused maintenance.
Updating logo for retina.
Fixing a small gradient color, and blurring on rotation.
Re-coloring welcome header.
Adding padding for activities module.
Updating logo for retina.
Fixing android header image.
Styling footer, using better web graphic for header.
Upgrading iphone/ipad app to support both ios 6 and tall-iphone.
New folder options: add subfolder.
Adding location to find friends.
Trimming mongodb lag cutoff to force feeds to correct themselves when slave lag becomes an issue.
Fixing 'r' refresh command for All Site Stories.
Fixing broken social page.
Google Reader logo and spacing.
...
