NewsBlur/media/img
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
..
chrome Adding Chrome Web Store banners + screenshots + originals. 2011-10-25 21:25:56 -07:00
icons Last few fixes for the folder counts always visible change. Now refreshed feeds update folder counts. 2011-11-01 00:20:06 -07:00
iphone Finishign up interaction of iphone app trailer page. Need auto switching. 2011-12-08 10:52:36 -08:00
mobile Adding new iphone mask image. 2012-01-05 08:35:35 -08:00
originals The @jashkenas treatment -- cleaning up the iphone app page. 2011-12-08 14:51:52 -08:00
reader Completing Twitter/FB OAuth end to end. Now need to surface and find friends. 2011-12-23 18:28:31 -08:00
static Screenshots added to press page. Press Page is now complete! 2011-04-24 11:20:22 -04:00
favicon.png LOGOS! New Favicon! New NewsBlur! New Logo! 2011-03-10 22:07:29 -05:00
logo_128.png Updating Chrome extension and logo_128. 2011-03-11 19:48:19 -05:00
logo_512.png Logos. 2011-03-17 23:52:57 -04:00
logo_newsblur.png LOGOS! New Favicon! New NewsBlur! New Logo! 2011-03-10 22:07:29 -05:00
logo_newsblur_512.png Logos. 2011-03-17 23:52:57 -04:00
logo_newsblur_blur.png Updating logos a bit. Adding transparency to the blur. Saving in original. 2011-03-11 00:39:09 -05:00