NewsBlur/apps
Samuel Clay b9cf65c834 Merge branch 'master' into social
* master:
  Renaming static.tar to static.tgz to reflect its gzippedness.
  Fixing ghost unread counts on folder when last story in a feed is read.
  Fixing link to scipy-superpack. (Thanks @boursier)
  Handling negative feature page bug. Also showing server errors on bad emails.
  Fixing missing username in dupe USF.
  Handling errors on river in client. Also fixing starred stories.
  Suppressing error on starring an already starred story.
  Re-enabling mobile site. /m/
  Fixing typo in aggressive feed fetching.
  No longer being aggressive about finding a feed's correct address if it returns a 400 or 500 error code, unless it is still the first run or an exception refresh.
  Adding SSL to nginx conf.

Conflicts:
	apps/reader/views.py
	assets.yml
	media/js/newsblur/reader/reader.js
2012-01-23 17:53:59 -08:00
..
analyzer Skip broken classifiers when saving. 2011-11-02 08:49:58 -07:00
api Adding method param error to /api/login and /api/signup. 2011-11-03 22:21:11 -07:00
feed_import Allowing username refinement in fetching starred stories. 2012-01-08 21:19:41 -08: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
profile Adding profile photos, hiding of completed Getting Started items, following and auto-following of new friends, creating connections. 2011-12-24 00:30:37 -08:00
reader Merge branch 'master' into social 2012-01-23 17:53:59 -08:00
recommendations Ordering unmoderated recommended feeds by date. 2012-01-12 20:01:07 -08:00
rss_feeds Adding social subscription relationship. Loading social feeds in with all feeds. Needs to be drawn in feed list. Also needs both original and feed view for social subs. 2012-01-20 09:38:41 -08:00
social Showing blurblogs on the feed list. 2012-01-21 16:12:54 -08:00
static Stubbing in iphone page. 2011-12-06 17:57:11 -08:00
statistics Adding social subscription relationship. Loading social feeds in with all feeds. Needs to be drawn in feed list. Also needs both original and feed view for social subs. 2012-01-20 09:38:41 -08:00
__init__.py Initial 2009-06-16 03:08:55 +00:00