* 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
* master:
ActionBar is part of the repo now (vendorized).
Better verbose logging for updating feeds.
Checking if feed id has changed, then removing from task queue.
Fixed the ridiculous bug with feed queuing: while checking to see if the feed id changed, self.pk changed along with the feed, resulting in the cached value changing!
Better logging for queues.
# 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.
* master:
Fixing stripe reimport
Upping feed fetching by quite a bit.
Fixing double counting stripe payment bug by clearing out striep purchase history when inserting.
* master:
Adding task servers to db firewall.
Adding redis cache. Returning favicon server.
Better munin plugins for redis and mongo.
Removing unused redis keys for shared/comments. Dry-run.
Adding read preference to migration.
Migration to create story_hash for missing feeds.
Making a clearer description of slow feeds.
Upping feed fetches, slowing down fetch interval for less active feeds, setting premium expire time to one year from most recent payment date (as opposed to borked payment gap logic), and adding logginf or tasking feeds.
Switching check for HAProxy'ied socket.io to dev instead of www. Thanks @anaconda!
Sync delay in mongodb and updating story hash migration.
Upping feed fetches.
Fix force close when attempting to fetch a user with a null user.id value
Fix force close updating ProfileActivityFragment if no profile response was received
Move creating ImageLoader in NewsBlurApplication to onCreate to ensure that base context has been set and prevent force close
Boosting fetches.
Fix duplicate requirement
Conflicts:
fabfile.py
* master:
Adding dev and debug to firewall
Adding hyphens to allowed hosts for blurblogs.
Adding X-nginx-server and X-gunicorn-server.
Adding RStats, necessary to remove mongodb analytics.
Fixing firewall setup.
Using secondary mongos for feed fetch histories.
Moving to a single hosts and hosts.yml file, used to control logs, deployment, firewalls, and communication. Awesome!
Moving hosts to secrets.
Cache busting feeds on force and 1% of the time.
Conflicts:
config/nginx.newsblur.conf
* master:
Fixing Google+ sharing.
64 sites, not 12 sites. Doh!
Adding expires header to icons.
Downgrading from Pillow, which is incompatible with PIL.
Pushing feed history deletion to end of stats collection.
Logging feed fetch deletions.
Fixing missing scipy import missing form PILlow.
Last imports for pillow.
Boosting feed fetches.
Upgrading from PIL to Pillow.
Upgrading from PIL to Pillow.
Upgrading from PIL to Pillow.
Adding cached template loader. Adding new mongodb.
Cutting number of feeds for fetching until mongo is sharded.
Conflicts:
fabfile.py
