NewsBlur/media/js/newsblur
Samuel Clay 8efefc6cdb Merge branch 'master' into social
* 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
2012-03-28 18:42:35 -07:00
..
common Comment replies! Practically threaded comments. Reply as many times as you like. 2012-03-22 19:37:19 -07:00
models Showing follow button, restyling taskbar buttons, fixing issues around previewing. 2012-03-15 11:33:00 -07:00
payments Moving stripe into payments folder. 2012-02-29 16:22:58 -08:00
reader Merge branch 'master' into social 2012-03-28 18:42:35 -07:00
static Rearranging javascript. Also backbonizing user models for follower and following collections. 2012-01-04 09:42:35 -08:00
views Following and unfollowing from intro. 2012-03-19 16:35:56 -07:00