Samuel Clay ac3609bf7d Merge branch 'master' into realtime ... * master: Adding 'E' as a keyboard shortcut for the Everything view. Doubling the amount Space pages in a story. Auto-linkify urls in stories. Reading stories from slave db during feed update. Conflicts: settings.py		2011-11-06 15:28:37 -08:00
..
css	Fixing a number of server bugs -- google reader import choking on bad xml, handling duplicate feeds properly.	2011-11-01 09:25:59 -07: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	Fixing a number of server bugs -- google reader import choking on bad xml, handling duplicate feeds properly.	2011-11-01 09:25:59 -07:00
iphone	Adding new API endpoint: mark_feed_stories_as_read. Refactored mark_story_as_read.	2011-11-05 16:25:04 -07:00
js	Merge branch 'master' into realtime	2011-11-06 15:28:37 -08: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