* 'master' of github.com:samuelclay/NewsBlur:
Fixing issue with PuSH hub topic's being too long for the db.
OPML import: Using custom feed titles if they don't match what's in the feed DB.
* master:
Fixing issue with PuSH hub topic's being too long for the db.
OPML import: Using custom feed titles if they don't match what's in the feed DB.
Conflicts:
apps/feed_import/models.py
* 'master' of github.com:samuelclay/NewsBlur:
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.
* 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' of github.com:samuelclay/NewsBlur: (32 commits)
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.
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.
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.
...
* 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:
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.
* 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
