Samuel Clay 69bf581cd2 Merge branch 'master' into social ... * master: Adding story permalink to story context-menu. Thanks to @grammargirl for the idea. Adding task servers and updating automated deploy. Removing dupe unique index in prep for social. Adding 3 new task servers. Conflicts: apps/analyzer/models.py fabfile.py media/js/newsblur/reader/reader.js utils/feed_fetcher.py		2012-05-17 13:27:29 -07:00
..
common	Fixing sharing and commenting for anonymous users. Also setting all stories to read if a user is not subscribed to it. Useful during a tryfeed view.	2012-05-14 16:43:27 -07:00
models	Embiggening twitter profile photos in profile dialog.	2012-05-09 13:51:48 -07:00
payments	Moving stripe into payments folder.	2012-02-29 16:22:58 -08:00
reader	Merge branch 'master' into social	2012-05-17 13:27:29 -07:00
static	Rearranging javascript. Also backbonizing user models for follower and following collections.	2012-01-04 09:42:35 -08:00
views	Adding recommend users to Friends dialog.	2012-05-15 16:35:09 -07:00