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
..
common	Rearranging javascript. Also backbonizing user models for follower and following collections.	2012-01-04 09:42:35 -08:00
models	Rearranging javascript. Also backbonizing user models for follower and following collections.	2012-01-04 09:42:35 -08:00
paypal	Rearranging javascript. Also backbonizing user models for follower and following collections.	2012-01-04 09:42:35 -08:00
reader	Merge branch 'jammit' into social	2012-01-05 08:38:08 -08:00
static	Rearranging javascript. Also backbonizing user models for follower and following collections.	2012-01-04 09:42:35 -08:00