* 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:
Wordpress PuSH errors aren't really errors, so don't log them.
Dealing with broken Wordpress PuSH plugin by subscribing to its requested topic url.
Dealing with broken Wordpress PuSH plugin by subscribing to its requested topic url.
Fixing Tumblr PuSH by sending the address instead of the link when subscribing.
Subscribing to a topic or hub sets the urls.
Launching real-time for premiums. Also fixing a few dupe feed refresh bugs.
Conflicts:
apps/reader/views.py
media/js/newsblur/common/assetmodel.js
* master:
Adding dev role, updating hosts, and checking for wp-cron in broken wordpress plugin PuSH pings.
Stupid broken Wordpress PuSH plugin tries to set wp-admin/post.php to its topic.
Adding logging to PuSH push requests.
Change OPML export filename to use ISO date format
Fixing broken redirected PuSH urls. Typo on datetime.
Refactoring updated urls in PuSH feeds.
Adding db04 to hosts.
Feeds are OneToOne with PushSubscriptions, so remove the db inconsistency.
Cranking manual refresh polling when disconnected from pubsub.
Client-side push/pubsub should reconnect and degrade gracefully.