* master:
db03 is no longer a db.
Redis to db01.
Logging stripe use.
Paywall on signup.
Extending random holds for feeds while being crushed.
Minimum of MEMORY/256 workers.
Minimum of MEMORY/256 workers.
Bumping gunicorn workers.
Only recount feeds if necessary.
Only recount feeds if necessary.
Conflicts:
media/css/reader.css
* master:
If there are no unread stories in a folder, don't request river_stories with no feeds, since that will return all unread stories. Fetch all feeds in folder. Thanks to @afita for pushing this.
Fixing sharing story by email if the story has no feed.
Fixing sharing story by email if the story has no feed.
Adding Tafiti, Windows 8 app, to logs.
1 month max on next fetch.
Conflicts:
media/js/newsblur/reader/reader.js
# By Samuel Clay (2) and jv2222 (2)
* master:
Cleaning up API to show multiple params better.
Cleaning up pull request.
Update utils/user_functions.py
Update apps/reader/views.py
* master: (81 commits)
Adding font size choices to web preferences.
Closing #66 with both integration of #68 and using the same fonts. Users can add an optional class if they want these other convenient fonts. Also using a few fonts as backups for non-Mac users.
Fix default theming hook
Add multiple targeted font stacks
Fixing #75: shared stories should use story permalink, not story guid. Doh. Thanks @denubis!
Categorizing preferences. Adding window title count back in.
Adding email lookup to forgot password flow.
Adding email lookup to forgot password flow.
Fixing typo in logging.
Fixing autocomplete behavior on add dialog.
Adding broken search for feeds.
Logging
Switching to guid-based read story counts from range based counts. Let's see what this screws up.
Everybody gets unread count in title.
Backporting collections.Counter to python2.6
Fixing broken reply interaction with links.
Prototype of a dupe checker using real-time update times to figure out which feeds are the same. Last time I walked down this road I got run over.
Adding delete user flow. About time, since I'm sick of doing this myself.
Deractivating premiums.
Adding a lock for the intelligence slider for focus stories. If the user selects focus and there are actually focus stories, lock it for the future when there are no unread focus stories.
...
Conflicts:
fabfile.py
* master: (331 commits)
Adding blurblog permalink to story on blurblog. Adding story slug to permalink. Fixing story guid hashes.
Re-enabling message property for facebook.
Ignoring image for facebook shares.
Commenting out facebook share message until they approve it.
Cleaning up Facebook og description.
Facebook using a website instead of article.
Facebook being a PITA.
Facebook wants ISO8601 datetime format.
Facebook doesn't like going to other URLs.
Facebook doesn't like going to other URLs.
Dumb typo in new facebook og crap.
Using blurblog permalink for new facebook shares.
Fixing Facebook share to use fancy actions.
Adding scroll to comments button to share bar. Thanks @afita.
Turning off microformats for more errors.
Fixing errors in timeouts to show the correct error. Also fixing microformats parsing issue and allow IPv6 URLs in enclosures to be ignored, fixing a bunch of feeds.
Cleaning redis stories for 1% of all feed fetches.
Refreshing feed on fetch.
Fiddling with logging on dupe feeds.
Adding bs facebook assets.
...
Conflicts:
apps/rss_feeds/models.py
settings.py
utils/feed_fetcher.py
