Samuel Clay b2c9f1310c Merge branch 'master' into social ... * master: Fixing issue with PuSH hub topic's being too long for the db. OPML import: Using custom feed titles if they don't match what's in the feed DB. Conflicts: apps/feed_import/models.py		2012-04-01 20:48:07 -07:00
..
fixtures	Finishing off Google Reader OAuth synchronization. Also renamed opml_import -> feed_import. And fixed the height of small modals.	2010-06-29 20:16:09 -04:00
management	Allowing username refinement in fetching starred stories.	2012-01-08 21:19:41 -08:00
migrations	Fixing Google Reader OAuth import when multiple folks are from the same IP. Using UUIDs in cookies, falling back to session state and IP addresses.	2011-04-01 17:25:28 -04:00
__init__.py	Finishing off Google Reader OAuth synchronization. Also renamed opml_import -> feed_import. And fixed the height of small modals.	2010-06-29 20:16:09 -04:00
models.py	Merge branch 'master' into social	2012-04-01 20:48:07 -07:00
tests.py	Updating all unit tests. So far Reader and Feed import pass. Still need to fix RSS feeds.	2011-08-31 18:04:45 -07:00
urls.py	Adding opml export links to Add Site dialog and Preferences dialog.	2011-03-11 11:22:28 -05:00
views.py	Merge branch 'master' into social	2012-03-29 13:57:47 -07:00