* 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
* master:
Fixing icon fetching error when the page is corrupted.
Writing a glorious hack that forces a count of unread scores.
Conflicts:
apps/reader/models.py
apps/rss_feeds/management/commands/refresh_feeds.py
fabfile.py
utils/feed_fetcher.py
* master:
Changing the color of sql duration times in debug logging. Yeah, nobody but me will see this, but boy is it pretty. Ask me sometime and I'd love to show you my insanely colorful logs.
Correctly handling story that lack titles but have content. Using a parsed and shucked truncation of content in place of missing titles.
Sanity check on deleted feeds.
Read it Later -> Pocket
Read it Later -> Pocket
Conflicts:
media/js/newsblur/reader/reader.js
* master:
Showing feed pushes in statistics.
Instrumentation to count feed pushes.
Migration to fix starred stories with incorrectly double-encoded url strings.
Fixing bug around missing feed links being checked for length.
Conflicts:
apps/rss_feeds/views.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 Cyrillic text issue by both using encoded text from server with the help of requests, and then serving it with a defined charset encoding back to the client.
* 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
* 'master' of github.com:samuelclay/NewsBlur:
If feed no longer exists after update, find it, then schedule fetch.
Don't skip unfetched feeds.
Don't skip unfetched feeds.
