* 'master' of github.com:samuelclay/NewsBlur:
Inverted logic on favicons fetching. Whoops. Fix in < 60 seconds, though.
Fixing the bug around favicon's not being found, since they were checking for the wrong property.
Logging al refresh_feeds requests.
* 'master' of github.com:samuelclay/NewsBlur:
Last few touch-ups for iPhone app v1.2. Almost ready to send to the app store. Need to design and build a website to finally launch this damn thing.
Fixing a number of API call parameters.
Handling server errors (500 errors) in iOS app. Also cancelling requests if switching to a new feed before old feed comes back.
Adding an Everything folder name to iOS app. Kinda ugly, kinda beautiful.
* 'master' of github.com:samuelclay/NewsBlur: (50 commits)
Fixing mark folder as read in iphone app. Also shortcutting mark site as read, so no action sheet needed.
Hot fix of a few exceptions.
Correctly updating feed exceptions by refreshing the feed on page. Also transferring over classifiers and read stories.
Speeding up refresh-feeds by correctly using the last updated story date.
Adding unique index on MStory.
Quick fix to broken usersubs when changing feed link and address.
Fixing bone-headed issue around renaming folders and having all child folders also renamed (client-side only).
All stories in starred stories view now have a score of 1, so they are always displayed.
Fixing bogus type error, caused by duplicate feeds.
Correcting styling on site settings loader icon.
Removing dupe migration from feed_settings.
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Fixing #41: Adding REDIS to local_settings.py.template.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Switching to requests from urllib2/httplib. Bring on the page errors.
Adding a bunch fo keyboard shortcuts.
Adding elapsed time field to river and feed view.
Fixing autolinking of text links to no longer indiscriminately replace text, causing double encoding of html entities.
Fixing the space bar key to not queue, so it's actually useful now!
...
* feed_settings:
Adding migration for unique hashes on feed addresses + links.
Counting subscribers on branched feeds correctly, so as to maintain update frequency, even though it's branched.
Hooking up feed address change nd branching. Also fixing those infernal feed address change bugs for good.
Finishing up feed_link corrections. Just need feed_address (which is essentially a refactor and abstraction of this feed_link code), and then duplicate UI, which is pretty easy. Yay.
Refactoring feed rewriting to take advantage of new feed link changer. Seems to work. Still needs some better duplicate locking during fetch.
Uniqifying address+link hash. Allowing feed_link branches, but it does not yet work. Needs proper dupe detection.
Beginning new branch feed logic. Needs a huge db migration.
Swapping titles on feed settings when necessary.
Swapping rss and website url.
Stubbing out entire feed settings modal. Needs duplicate feed list. Also needs backend splitting of subscriptions.
Adding feed setting menu item. Cleaning up feed exception dialog.
* master:
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Fixing #41: Adding REDIS to local_settings.py.template.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Switching to requests from urllib2/httplib. Bring on the page errors.
Adding a bunch fo keyboard shortcuts.
Adding elapsed time field to river and feed view.
Fixing autolinking of text links to no longer indiscriminately replace text, causing double encoding of html entities.
Fixing the space bar key to not queue, so it's actually useful now!
Refining media enclosures by adding all types and linking to their source.
Refining media enclosure detection.
* master:
Correcting for feeds that have incorrect media content.
Adding media enclosures in an audio tag.
Using story date when there is no guid.
Using story date when there is no guid.
Adding verbose flag to feed updates to diagnose errors.
Fixing issue with stories that have no permalink.
Conflicts:
apps/rss_feeds/models.py
* master:
Updating copy on homepage.
Marking all as read on Everything view should clear folder unread counts.
Fixing error on committing to cache for rate limits when the dummy cache backend is used.
Conflicts:
templates/reader/feeds.xhtml
