* 'master' of github.com:samuelclay/NewsBlur:
Renamed screenshots archived for v1.1.
Quick fix for duplicate feeds to be more specific. Also renaming screenshots of iOS app in anticipation for tomorrow's v1.2.
* 'master' of github.com:samuelclay/NewsBlur:
Correcting for include_favicons=false on flat feeds.
Adding ShareKit and its many associated dependencies. Instapaper, pinboard, twitter, facebook, and more sharing directly from the original story action button.
Fixing include_favicons to default to false, and correctly use a false value.
Marking all as read in Everything view. Refactored story detail view. Fixing bug around quicly tapping Next Unread and having the view pop before the next story is loaded.
* '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:
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.
* master:
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!
Refining media enclosures by adding all types and linking to their source.
Refining media enclosure detection.
Conflicts:
config/nginx.newsblur.conf
* 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.
* 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: (48 commits)
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.
Adding linux.com story to press page.
Uniqifying stories when read.
Moving from sha module to hashlib.
Syncing time to account for time drift on VPS.
Fixing issue around showing too many Oh Nos on abort.
Save hash for address+link migration. necessary for a unique index.
Deprecating db02, moving redis and rabbitmq over to db01.
Updating nginx conf to support better amintenance pages giving a 503 status code.
Moving NewsBlur counts to beginning of title.
Fixing that crummy missing existing story issue.
Updating feedparser.
Fixing broken hashlib issue with feeds and no link.
Adding MongoDB slave to local_settings template.
Adding two new columns, necessary for the feed_settings branch: hash of address+link, and locking address.
Marking read stories in Feed view as very much read. Gradientizing, too.
Fixing /m/ for no good reason.
File under "fucking finally": Adding client-side error handling and callbacks for feeds and river.
...
Conflicts:
config/nginx.newsblur.conf
* 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
* master:
Adding linux.com story to press page.
Uniqifying stories when read.
Moving from sha module to hashlib.
Syncing time to account for time drift on VPS.
Fixing issue around showing too many Oh Nos on abort.
Save hash for address+link migration. necessary for a unique index.
Deprecating db02, moving redis and rabbitmq over to db01.
Updating nginx conf to support better amintenance pages giving a 503 status code.
Moving NewsBlur counts to beginning of title.
