* 'master' of github.com:samuelclay/NewsBlur:
Calculating correct page fetch timing offset (if it was a 304).
Adding server name and feed code to analytics.
Turning analytics logging back on.
Temporarily commenting out analytics to see if they cure the slow down.
* 'master' of github.com:samuelclay/NewsBlur:
Shortening names on analytics for improved space saving.
Adding new analytics collections to keep track of page loads and feed fetches. Need to start aggregating before I can tell how useful this data will be.
Adding new analytics collections to keep track of page loads and feed fetches. Need to start aggregating before I can tell how useful this data will be.
Adding VentureBeat article to press page.
Adding order/read_filter to api. Also adding river blurblog.
Fixing right click on folders.
Adding a bit of error checking on read stories for social subs.
Fixing @afita's issue around weirdness in Feed story selection when story titles are pinned to top.
Scrolling to selected story when re-opening hidden story titles pane. Thanks @afita.
* 'master' of github.com:samuelclay/NewsBlur:
Adding new analytics collections to keep track of page loads and feed fetches. Need to start aggregating before I can tell how useful this data will be.
Conflicts:
apps/statistics/models.py
* 'master' of github.com:samuelclay/NewsBlur:
Fixing bug where publisher-disabled original pages were not properly disabled.
Fixing bug where publisher-disabled original pages were not properly disabled.
Fixing scroll bug when feed has no unreads but in unread view.
* 'master' of github.com:samuelclay/NewsBlur:
Fixing bug where publisher-disabled original pages were not properly disabled.
Conflicts:
apps/rss_feeds/models.py
* 'master' of github.com:samuelclay/NewsBlur:
Marking story as read on 'o'-open.
Adding shift+t for @afita to close the story titles pane.
Fixing crashing iOS app on missing feed info.
Sparing the incredibly difficult and timely process of finding follow-backs on twitter/fb import.
Adding reload feed/folder keyboard shortcut to keyboard dialog.
Keyboard shortcut 'r' refreshes the current feed/folder.
Fixing profile acitvities. Thanks @afita for the find.
Fixing variety of exceptions on adding a site, interactions, services, loading friends.
Tweaking right-click on feeds and upping ratelimit.
* '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.
...
