Merge branch 'master' of https://github.com/ojiikun/NewsBlur into pr/130-test
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into pr/130-test
Fixing feed address change by feed link when colliding with existing feed.
Fixing feed address change by feed link when colliding with existing feed.
Adding feedparser trunk, in case I want more pain.
Fixing a few small feed collision errors.
Handling timeouts for feed link change.
Fixing broken JPG image sizer.
Handling 0 images found for shared story.
Better logging for queues.
Fixed the ridiculous bug with feed queuing: while checking to see if the feed id changed, self.pk changed along with the feed, resulting in the cached value changing!
Checking if feed id has changed, then removing from task queue.
Handle new user registration error reply by informing user of issue with regiration attempt
When login fails go back to login activity rather than previous view
Merge branch 'master' of https://github.com/samuelclay/NewsBlur
Fix crash when new user registers. For some unknown reason the code was
doing a feed pull and then always expecting folders when there obviously
wouldn't be any if the user just registered.
Fix feed parsing issue when user has no feeds
Better verbose logging for updating feeds.
Merge pull request #141 from lance0428/master

Several fixes around login and registering new account
Make initial sync on creation of Main activity folllow recommended two-step API pattern.