* 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
* social: (597 commits)
Updating celery calls in prep for upgrade to celery 3.0.
Getting IE9 working with OPML ajax upload.
Typo on never_cache after json view. Doh.
Fixing the living crap out of IE9. Everything works excellently now.
Upgrading jQuery 1.7.1 to 1.7.2 and upgrading bootstrap's carousel to 2.0.5.
Adding _gaq for debug, when analytics aren't present.
Taking @mgeraci's suggestion and moving the Starred! message to the opposite gravity of the story titles pane.
Double clicking sites and stories now works. Thanks to @ojiikun for figuring this one out.
Fixing scroll/paging bug where the wrong story would be selected. Technically it's not fixed, but the indicator is now always present, so you know why it's happening. Thanks to @afita for the thorough investigation.
Lots of little bugs: avatar images, icon importer, page importer, adding analytics tracking to intro.
Fixing following bug due to array truncation of following list.
Small tweaks to blurblogs. iPadifying blurblogs.
Adding /social/activities endpoint for Android and iOS.
Fixing bug when a story changes its guid (like on a tumblr rename), but it still thinks it has comments. Forcing each story to recount its comments if comments are claimed, just in case.
Showing social service fetch status in real-time (actually polling every 3 seconds) in both intro and friends dialogs.
Fixing issue in social connecting to Twitter/FB in popup.
Google Analytics on Blurblogs.
Trying to outwit IE by adding in a fake console.
console.log -> NEWSBLUR.log
Adding sync status and tasking facebook/twitter friend imports.
...
Conflicts:
settings.py
* master:
Adding MongoDB logging for debug.
Being far kinder during feed exception handling and showing users error text. Cannot believe this wasn't there.
Conflicts:
media/css/reader.css
templates/base.html
utils/json_functions.py
* master:
Fixing hub url change subscription.
Adding failed push feeds to munin.
Showing correctly real-time status if feed is push.
Showing correct real-time status if feed is push.
Emergency fix to not have to reverse url in task fetchers.
Setting up push feeds for removal.
Adding munin graph for pushed feed queue and nginx conf.
Logging real-time.
Resubscribing to real-time feeds on add/remove feed.
Adding push feeds queue. Ignoring fat ping, since it might not match URLs.
Cleanup
Forgive push subscription errors.
Adding # of push feeds to munin.
Correcting a double-encoding bug for story permalinks that was from way back when.
Fixing the shit out of the feed fetcher's deleted feed handling. Also fixing PuSH support to correctly give parameters to PuSH server.
Checking for push hub links safetly.
Adding subscription callbacks for PuSH.
Stubbing in PuSH support. Need to work it in with Feeds and upgrade rel='hub'.
Conflicts:
apps/reader/models.py
media/js/newsblur/reader/reader.js
settings.py
utils/feed_fetcher.py
* master:
Fixing missing status code in feed fetcher.
Fixing missing status code in feed fetcher.
Adding stathat stats for feed fetching and parsing.
Small cleanup to parameters of feed update method.
Refactoring starred stories indexes and adding hints.
Removing hints.
Adding hints, revising indexes on user stories, and trying to quicken feed fetching meta work.
Refactoring refresh feed unread counts. Fixing tests.
Adding task04 to fabfile.
Adding django 1.4 compatibility.
If feed no longer exists after update, find it, then schedule fetch.
Don't skip unfetched feeds.
Don't skip unfetched feeds.
Conflicts:
apps/reader/models.py
apps/reader/views.py
fabfile.py
utils/feed_fetcher.py
