* 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.
...
* social:
Better watching for story changes. This is both a speed improvement and usability fix, since now stories that haven't changed recently but did change before will no longer be declared as updated every time they are fetched. Props to @textfiles for the push.
* 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
* social:
fixing bug with feed exception when there is a duplicate feed id
Fixing shift+a for social subs. Also fixing bug where site would stay selected after adding a new site.
Fixing tutorial by forcing dialog resize. Thanks to @afita for finding this bug.
Adding necessary cookie domain settings to local_settings template.
Whoops, forgot to remove 1 second sleep from autocomplete.
Fixing the living snot out of the add site dialog. Adding an autocomplete spinner, showing results on focus, and no longer auto-adding on click (allowing user to select a folder). Big thanks to @afita for the push.
Fixing broken offset for locked mouse indicator on site reload. Thanks to @afita for bug report.
Removing cjson. Fixing collect_stats requirement on bootstrap.
Adding logging to celerybeat. Adding site unread count calculation to homepage freshening.
Moving cronjob tasks over to celerybeat. Starting with task_feeds, collect_feedback, collect_stats, and mark_read for homepage freshening.
* master:
Being much more aggressive about certain sites trying to take over the iframe. Blocking nytimes.com, twitter.com, and stackoverflow.com from even allowing an Original view.
Conflicts:
media/css/reader.css
