* master:
Fixing story hash migration to run by user.
Adding story_hash to starred stories, user stories, and shared stories.
Adding redis backup script.
* master:
Refactoring real-time socketio clientside to fix multiple client updates.
Unread counts only for logged in users.
Conflicts:
media/js/newsblur/reader/reader.js
* master:
Fixing small bug around missing feeds during update pipeline.
Fixing race condition between primary adn secondaries when creating feed fetch histories.
Reversing order for fetch histories.
Moving from feed/page/push histories to capped fetch history.
Conflicts:
apps/rss_feeds/views.py
* master:
Skipping tasking of feeds when queue is too high. Use the random queue.
Pushing out feed updates to cope with influx.
Don't allow stories to come from more than 24 hours into the future.
Removing force from new feeds.
Adding in timing on feed cleanup.
Increasing fetches for long tail feeds.
Adding logging, feed cleanup to forced fetch feeds, and expirations on user read stories.
Adding supervisord.conf config to include minfds (ulimit -a) support.
Conflicts:
utils/feed_fetcher.py
* master:
Upping Android to version 1.2.
Bumping up feed fetching for premiums.
Refunding stripe payments.
ActionBar is part of the repo now (vendorized).
Make initial sync on creation of Main activity folllow recommended two-step API pattern.
Fix feed parsing issue when user has no feeds
Fix crash when new user registers. For some unknown reason the code was doing a feed pull and then always expecting folders when there obviously wouldn't be any if the user just registered.
When login fails go back to login activity rather than previous view
Handle new user registration error reply by informing user of issue with regiration attempt
Conflicts:
apps/profile/models.py
# By ojiikun (8) and others
# Via Samuel Clay (3) and ojiikun (1)
* master:
Handling 0 images found for shared story.
Fixing broken JPG image sizer.
Handling timeouts for feed link change.
Fixing a few small feed collision errors.
Adding feedparser trunk, in case I want more pain.
Fixing feed address change by feed link when colliding with existing feed.
Fixing feed address change by feed link when colliding with existing feed.
Revert change that disabled user images for shared/commented on a story and liked comments
Undoing whitespace changes in APIManager.
Undo whitespace changes in APIClient.
Fully remove redundant sync during login.
Remove extra debug. Add full API logging.
Cleanup comment views.
Prevent force close in SetupCommentSectionTask if there is no data in the reply user cursor.
Added .gitignore so ant files aren't accidentally comiitted.
Clarify shell HOWTO instructions.
Added shell build HOWTO.
Remove extra sync in login frag. Disable favicos. Better Debug.
* master:
Cleaning up counts in munin and work log.
What the f? strip_comments now eats CPU on bad stories. But why now and not a few months ago when I introduced it?
Adding timeout to strip comments.
Using proper hostname for task server. Adding verbosity to feed fetching.
* master:
Adding tasked_feeds set to handle dropped feeds.
Fixing missing feed bug.
Adding new task server role: only new and push feeds.
Fixing munin counts.
* master:
Cleaning up queue migration.
Handling decayed feeds with no more active subscribers. They don't get returned to the scheduled_updates queue until there are enough active users.
Only need next scheduled update.
Fixing feeds that fall through.
Moving task queue from postgres db backed to redis backed.
# By Samuel Clay (12) and Lance Johnson (1)
* master:
Updating postgres config, celery queue.
Boosting feed fetching.
Android: show server error message to user when add feed fails. The error message was being sent when non-premium users tried to search for feeds and was causing the App to crash.
Removing unused feed hash index (keeping the unique constraint).
Adding two indexes and killing one unused one from feeds.
Returning index on active subs.
Changing logging on feed queueing.
Turning off autocomplete for the time being.
Removing unused indexes.
Upgrade to postgres 9.2.
Culling some graphs on feed counts.
Cleaning up week old feeds.
Boosting feed fetching way up for the weekend.
