* 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.
...
* 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
* social:
Fixing mail tempaltes to center everything. Mac OS X 10.8 broke centering in the new Mail.app.
Showing better error messages for front-end users.
Better time breakdowns on site loading.
Slightly altering styling on feed chooser hamburgers.
Rewriting new user email. Animating hamburgers.
Adding images to all footer links.
Conflicts:
apps/reader/views.py
* social:
Auto-linkifying comments and replies, and stripping html from comments, replies, and story titles, tags, and authors.
Adding compacting to user sub folders, to remove dupe subscriptions.
Clearing folders and decoding unicode.
Typo in gunicorn conf.
Only using appropriate number of gunicorn processes, making this machine agnostic.
Deferring OPML import if it takes > 20 seconds. Email user when complete. Also, hamburgers. This one's for @torrez.
Adding vps roles to fabfile.
Conflicts:
apps/reader/views.py
apps/social/models.py
