Samuel Clay 8f4dd6566c Merge branch 'jammit' into social ... * jammit: Adding new iphone mask image. Moving to proper unicode string for feed fetching. Colorizing feed fetching. Colorizing feed fetching. Adding two error classes to requests exception handling. Adding two error classes to requests exception handling. Adding two error classes to requests exception handling. jQuery 1.6.1 -> 1.7.1. Fixes massive Chrome issues. Adding shift+u as a shortcut for marking a story unread. Adding more advanced exception handling for new requests module, with fallback to urllib2. Adding urllib fallback to requests in page fetching. Adding a little bit more leeway in page importer by falling back to urllib2 when requests fail. Adding slight bit of color to feed fetcher. Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors."" Conflicts: assets.yml local_settings.py.template media/js/jquery-1.7.1.js media/js/jquery-1.7.js media/js/vendor/jquery-1.7.js		2012-01-05 08:38:08 -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	Fixing exception around multiple feeds during Google Reader import process. Also switching rate limit to status code 429.	2011-12-18 11:21:20 -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	Skipping missing feeds during training.	2012-01-03 10:05:43 -08:00
recommendations	Adding browser user agent to all logging.	2011-09-16 09:26:22 -07:00
rss_feeds	Merge branch 'jammit' into social	2012-01-05 08:38:08 -08:00
social	Rearranging javascript. Also backbonizing user models for follower and following collections.	2012-01-04 09:42:35 -08:00
static	Stubbing in iphone page.	2011-12-06 17:57:11 -08:00
statistics	Merge branch 'master' into social	2011-12-18 21:26:27 -08:00
__init__.py	Initial	2009-06-16 03:08:55 +00:00