* 'master' of github.com:samuelclay/NewsBlur:
Fixing broken menus.
Simplifying top dashboard button.
Fixing audio handler for Firefox.
Fixing right clicks and updating team.
Encoding utf-8 strings into bytecodes so lxml doesn't choke.
Fixing ghost unreads by accounting for the implicit score of 1 in unsorted sets in redis when intersected with a sorted set. Doh!
Fixing errors in story training classification on social subs.
Fixing double-activities bug.
* 'master' of github.com:samuelclay/NewsBlur: (25 commits)
Traverse folders if using Next Unread in folder view.
Fixing issue with top-anchored story titles list and story marker position. Thanks to @afita for the persistence.
Opening site after adding it.
Attempting to fix user exception dialogs.
Using parent folder to update all parent folders on read story.
Using correct bookmarklet css.
Fixing bug I've been tracking down for a while. Following an activity on a user you don't follow now correctly shows a tryfeed. Thanks to @afita for the great find!
Fixing Youtube embeds and correctly handling keyboard events when share is in transit.
Adding support for YouTube and Vimeo video embeds in share bookmarklet.
Correctly stripping tags from titles in shared stories.
Speeding up the first half of the bookmarklet.
Using a 0 feed_id for shared stories with no feed.
Fixing share date in bookmarklet.
Fixing typo in share bookmarklet.
Finishing bookmarklet, having added all side info (same share, other shares on site, and user's previous shares). Also handling gracious resizes.
Scrubbing content and title from bookmarklet. Completing flow when updating comments, so showing user's own comments and customized title/content. Just need to show other shared stories and it'll be ready to ship.
Completing share flow from bookmarklet. Needs listing of previously shared stories, and perhaps some error handling.
Completing flow for sharing using bookmarklet. Just needs to actually share the story, then show shared stories in sidebar.
Cleaning up bookmarklet layout a bit.
Adding share api calls to bookmarklet.
...
* bookmarklet:
Finishing bookmarklet, having added all side info (same share, other shares on site, and user's previous shares). Also handling gracious resizes.
Scrubbing content and title from bookmarklet. Completing flow when updating comments, so showing user's own comments and customized title/content. Just need to show other shared stories and it'll be ready to ship.
Completing share flow from bookmarklet. Needs listing of previously shared stories, and perhaps some error handling.
Completing flow for sharing using bookmarklet. Just needs to actually share the story, then show shared stories in sidebar.
Cleaning up bookmarklet layout a bit.
Adding share api calls to bookmarklet.
Adding selection html to bookmarklet.
Two sides to the share bookmarklet.
Formatting article.
Cleaning up text on share bookmarklet.
Stubbing out new bookmarklet with readability script.
* master:
changing entitlements
adding in recompiled ipa
adding new ipa
aadding in new ipa url
Adding logging for downloading enterprise ios app.
Adding MIMEtypes to .ipa and .plist for iOS app.
adding ipad
adding in new plist
Adding iOS app download for enterprise distribution.
adding enterprise ipa
Adding days arg to popular stories to grab even more.
* 'master' of github.com:samuelclay/NewsBlur:
changing entitlements
adding in recompiled ipa
adding new ipa
aadding in new ipa url
Adding logging for downloading enterprise ios app.
Adding MIMEtypes to .ipa and .plist for iOS app.
adding ipad
adding in new plist
Adding iOS app download for enterprise distribution.
adding enterprise ipa
Adding days arg to popular stories to grab even more.
Ignoring Circular's css in master, to be removed in Circular.