Samuel Clay 3c9114fa05 Merge branch 'master' into dynamodb ... * master: S3 icons. Untested. Removing old feed pages from mongo. Allowing proxy of S3 for original pages to be turned off. Adding ec2 mdadm setup. Adding proxy for S3 pages. Migration for s3 flags for pages + icons. Migrating to S3 for feed pages. Cleaning up footer on welcome page. Retina-izing twitter and github logos. Adding mongo conf for ec2 (trying out ec2 for some servers). Fixing a bunch of small exceptions. Small cleanup on welcome page, fixing social subs urls. Updating welcome apge to include pricing and a cleaned up footer. Fixing a couple of update bugs -- story cascading potentially resulting in invalid ids (probably not), and not unique errors on new page fetches. Conflicts: apps/rss_feeds/models.py settings.py		2012-09-19 16:37:47 -07:00
..
fixtures	Moving from samuel@ofbrooklyn.com to samuel@newsblur.com.	2012-06-20 18:37:46 -07:00
management	Merging separate task feeds tasks.	2012-08-09 21:18:45 -07:00
migrations	Merge branch 'master' into dynamodb	2012-09-19 16:37:47 -07:00
__init__.py
admin.py
icon_importer.py	S3 icons. Untested.	2012-09-19 16:33:23 -07:00
models.py	Merge branch 'master' into dynamodb	2012-09-19 16:37:47 -07:00
page_importer.py	Removing old feed pages from mongo.	2012-09-19 12:36:50 -07:00
tasks.py	Trimming mongodb lag cutoff to force feeds to correct themselves when slave lag becomes an issue.	2012-09-13 13:54:40 -07:00
tests.py	Refactoring refresh feed unread counts. Fixing tests.	2012-03-26 11:04:05 -07:00
urls.py	Adding etags (304's) to feed icons.	2012-03-29 16:03:06 -07:00
views.py	Attempting to fix user exception dialogs.	2012-08-27 15:22:42 -07:00