Samuel Clay 3c31c0c6a6 Merge branch 'master' into social ... * master: Adding MongoDB logging for debug. Being far kinder during feed exception handling and showing users error text. Cannot believe this wasn't there. Conflicts: media/css/reader.css templates/base.html utils/json_functions.py		2012-04-06 18:35:40 -07:00
..
api	Fixing issues around adding a folder in the add site bookmarklet. Cleaning up the modal by taking out the folder icon.	2011-03-21 20:37:58 -04:00
import	Fixing broken signup form for google reader import.	2011-09-28 16:44:39 -07:00
mail	Merge branch 'master' into social	2012-02-29 16:22:47 -08:00
mobile	Handling turned off redis server (in case redis goes down), and fixing up the /m/ mobile site.	2012-02-21 17:35:51 -08:00
profile	Styling errors on stripe payment form.	2012-02-29 12:57:46 -08:00
reader	Adding invite request.	2012-04-05 13:51:08 -07:00
recommendations	Switching a ton of feed and user fetches to simple ID matches. ".user.pk -> .user_id"	2012-01-26 09:32:24 -08:00
rss_feeds	Fixing misc number errors in status page.	2011-03-01 10:26:28 -05:00
social	Logging the crap out of the social connect popup.	2012-04-06 15:39:11 -07:00
static	Merge branch 'master' into social	2012-03-14 13:42:47 -07:00
statistics	Auto-following self, fixing issues around social profile creation, adding animations for firefox.	2012-03-07 15:01:44 -08:00
404.html	Protopub -> NewsBlur	2010-06-08 11:19:07 -04:00
500.html	Protopub -> NewsBlur	2010-06-08 11:19:07 -04:00
502.html	Moving stripe into payments folder.	2012-02-29 16:22:58 -08:00
base.html	Merge branch 'master' into social	2012-04-06 18:35:40 -07:00