Samuel Clay 850a12fea9 Merge branch 'master' into social ... * master: Minor changes to fabfile. Needs to only run the pre_deploy step once. Adding uglify-js. Fixing paypal return. Fixing default state while waiting for statistics data to come in. Adding feed update interval for non-premium users in Statistics. Adding Chrome Notifier to Goodies page. Adding Tumblr to share menu. Ordering unmoderated recommended feeds by date. Conflicts: utils/json_functions.py		2012-01-13 22:26:16 -08: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	Completing Twitter/FB OAuth end to end. Now need to surface and find friends.	2011-12-23 18:28:31 -08:00
mobile	JS is now complete. Need to fix css embeds.	2011-11-07 09:35:51 -08:00
reader	Merge branch 'master' into social	2012-01-13 22:26:16 -08:00
recommendations	Finishing up delete feed in iPhone app. Let's ship this thing.	2011-10-20 09:32:39 -07:00
rss_feeds	Fixing misc number errors in status page.	2011-03-01 10:26:28 -05:00
social	Completing Twitter/FB OAuth end to end. Now need to surface and find friends.	2011-12-23 18:28:31 -08:00
static	Rearranging javascript. Also backbonizing user models for follower and following collections.	2012-01-04 09:42:35 -08:00
statistics	Moving around items on the dashboard for easier first time experience.	2011-12-20 08:55:55 -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
base.html	Rearranging javascript. Also backbonizing user models for follower and following collections.	2012-01-04 09:42:35 -08:00