Samuel Clay dd6e33ac33 Merge branch 'master' into circular ... # By Samuel Clay (2) and ojiikun (2) * master: Adding node group to fabfile. Fix crash on empty use pictures. Correcting for feedburner stupidity. Auto-sync the feed/folder list if it has been more than 10 minutes since the last refresh.		2013-05-14 16:01:34 -07:00
..
api	Fixing Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug.	2013-04-30 13:58:16 -07:00
import	Upgrading django from 1.3 to 1.5.	2013-03-20 15:05:52 -07:00
mail	Forcing dev subdomain on new user queue email.	2013-05-13 18:31:44 -07:00
mobile	Adding first JS to blurblogs: loading public comments.	2012-06-29 21:06:33 -07:00
profile	Addung RNewUserQueue, an automatically emptying new user queue. Forcing all new users to go through paywall.	2013-05-13 18:03:17 -07:00
reader	Re-designed footer. Adding footer to homepage.	2013-04-18 13:49:30 -07:00
recommendations	Adding iPhone sized interaction cell. Also fixed infernal race condition between loading stories and looking for try feed when animating in feed detail view controller.	2013-02-21 17:57:32 -08:00
rss_feeds	Adding active premiums to status page.	2012-12-21 18:22:26 -08:00
social	Story title is safe for html entities.	2013-05-13 12:26:15 -07:00
static	Doh! Had backbone in there twice.	2013-05-13 09:51:55 -07:00
statistics	Cleaning up homepage.	2013-02-26 10:20:06 -08:00
404.html	Upgrading django from 1.3 to 1.5.	2013-03-20 15:05:52 -07:00
500.html	Upgrading django from 1.3 to 1.5.	2013-03-20 15:05:52 -07:00
502.html	Slight cleanup of error templates.	2012-12-12 17:13:15 -08:00
502.http	Premiums users with no active feeds should get all of their feeds activated.	2013-03-25 13:01:04 -07:00
base.html	Re-designed footer. Adding footer to homepage.	2013-04-18 13:49:30 -07:00
maintenance_off.html	Merge branch 'master' into circular	2013-05-14 16:01:34 -07:00