NewsBlur/media
Samuel Clay ba5618295a Merge branch 'master' into feed_settings
* master:
  Updating copy on homepage.
  Marking all as read on Everything view should clear folder unread counts.
  Fixing error on committing to cache for rate limits when the dummy cache backend is used.

Conflicts:
	templates/reader/feeds.xhtml
2011-11-23 16:59:25 -05:00
..
css Merge branch 'master' into feed_settings 2011-11-15 20:36:21 -08:00
extensions Adding pref for turning off animations. Still needs some love. 2011-06-07 12:57:34 -04:00
fonts Adding Gothic font for the star in the logo. 2011-07-31 14:17:04 -07:00
img File under "fucking finally": Adding client-side error handling and callbacks for feeds and river. 2011-11-15 18:19:09 -08:00
iphone Fixing iOS bug around the story progress indicator not being updated when returning from suspended state. 2011-11-15 09:26:19 -08:00
js Merge branch 'master' into feed_settings 2011-11-23 16:59:25 -05:00
theme First half of drag-and-drop: The JavaScript half is done. Feeds can be moved freely. Complete with prettiness. 2010-07-10 17:59:17 -04:00
admin Switching to mod_wsgi from mod_python, adding nginx, and adding like/dislike buttons. 2009-07-05 18:15:58 +00:00
crossdomain.xml Protopub -> NewsBlur 2010-06-08 11:19:07 -04:00
maintenance.html.unused Whoops. GT 0, not GTE 0. 2010-10-15 19:46:49 +00:00
robots.txt Adding robots.txt so only the homepage will be crawled. 2011-01-04 08:56:25 -05:00