NewsBlur-viq/apps
Samuel Clay c4731c8211 Merge branch 'master' into social
* 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
2012-03-30 17:15:31 -07:00
..
analyzer Beginning the process of getting anonymous users able to read social feeds. Also setting up unread counts for new machines. 2012-03-29 17:24:23 -07:00
api Switching a ton of feed and user fetches to simple ID matches. ".user.pk -> .user_id" 2012-01-26 09:32:24 -08:00
feed_import Merge branch 'master' into social 2012-03-29 13:57:47 -07:00
mobile Adding in new mobile site. Doesn't sohwing anything but a stubbed in list view. 2011-06-05 17:52:11 -04:00
oauth Uniqifying profiles. Small cleanup. 2012-03-20 16:46:38 -07:00
profile Nulling fields for profile that don't work in prod yet. 2012-03-21 12:28:51 -07:00
push Wordpress PuSH errors aren't really errors, so don't log them. 2012-03-30 17:12:03 -07:00
reader Merge branch 'master' into social 2012-03-30 17:15:31 -07:00
recommendations Lightening up the intelligence control. 2012-03-01 10:15:26 -08:00
rss_feeds Finishing up manage menu for social feeds. Needed a fix for unfollows. 2012-03-30 14:56:16 -07:00
social Finishing up manage menu for social feeds. Needed a fix for unfollows. 2012-03-30 14:56:16 -07:00
static Stubbing in iphone page. 2011-12-06 17:57:11 -08:00
statistics Merge branch 'master' into social 2012-02-27 13:13:27 -08:00
__init__.py Initial 2009-06-16 03:08:55 +00:00