* master:
Fixing scrolling height when mouse indicator position is locked. Expands padding to fit the bottom-most story. Thanks to @bdarnell and @dancarroll for the push. Fixes#230.
Slight cleanup of fabfile.
Adding all role to send commands to every server (specificaly setup_hosts).
* master:
Fixing issue where user agent doesn't exist.
Change crossover to narrow view from 700 to 720px.
Conflicts:
media/js/newsblur/reader/reader.js
* master:
Fixing Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug.
* schedule_dev:
Fixing overcommit_memory allocation error for new redis machines.
Adding metric for last story date, used to calculate next scheduled update.
Correcting for premiums being counted twice.
Use average stories per month in calc.
Complete rewrite of feed update schedule.
* master:
Fixing huge bug in mark_feed_read for socialsubs.
Increasing logging on read social sub stories.
Shift+a to mark as read for blurblogs.
Shift+a to mark as read for blurblogs.
Marking as read covers both socialsubs and feeds.
Conflicts:
apps/reader/views.py
* master:
Falling back to a POST request on river queries that have too many feeds.
Fix tabbing in previous commit.
Fix folder select clauses to always include root folder. Refactor selection clauses in general.
* master:
Fixing credit card images. Doh\!
Upping feed fetching.
Removing random interval in feed fetches.
No longer random intervals for dead feeds.
Fixing mark as unread in redis hash migration.
Fix group type caching in FolderList, and much refactoring for readability therein.
Remove special All Stories group and make the now-visible root folder perform it's function.
Formalize top-level folder name workaround.
Nonfunctional refactoring in list adapter (unused vars, method visibilities, annotations).
Fix an initialization edge case in creating column/resource ID mappings.
Fix regression in API to get /reader/feeds and set update_counts to true.
Factor out duplicate code in APIClient to ensure parameterized GETs behave like bare GETs.
Refactor FolderListFragment and associated Adapter.
Fix bad merge.
Remove accidentally added swapfile.
Removed missing root feed workaround. Refactoring FolderListFragment for readability.
Clean up parsing of /reader/feeds response and work around problems with empty-named root folder.
Fix NPE crash when adding new feed.
Conflicts:
apps/rss_feeds/views.py
