NewsBlur/media
Samuel Clay b41704339d Merge branch 'master' into jammit
* master: (48 commits)
  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.
  Adding linux.com story to press page.
  Uniqifying stories when read.
  Moving from sha module to hashlib.
  Syncing time to account for time drift on VPS.
  Fixing issue around showing too many Oh Nos on abort.
  Save hash for address+link migration. necessary for a unique index.
  Deprecating db02, moving redis and rabbitmq over to db01.
  Updating nginx conf to support better amintenance pages giving a 503 status code.
  Moving NewsBlur counts to beginning of title.
  Fixing that crummy missing existing story issue.
  Updating feedparser.
  Fixing broken hashlib issue with feeds and no link.
  Adding MongoDB slave to local_settings template.
  Adding two new columns, necessary for the feed_settings branch: hash of address+link, and locking address.
  Marking read stories in Feed view as very much read. Gradientizing, too.
  Fixing /m/ for no good reason.
  File under "fucking finally": Adding client-side error handling and callbacks for feeds and river.
  ...

Conflicts:
	config/nginx.newsblur.conf
2011-11-24 00:29:57 -05:00
..
css Marking read stories in Feed view as very much read. Gradientizing, too. 2011-11-15 18:37:42 -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 jammit 2011-11-24 00:29:57 -05:00
theme
admin
crossdomain.xml
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