* 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
* 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:
Prioritizing autocomplete matches on title before address.
Handling URLs in autocomplete.
Adding new autocomplete. Let's hope this doesn't destroy performance in Redis.
Using new Chrome extension for RSS.
Conflicts:
apps/rss_feeds/views.py
* 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:
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:
Moving original page server to redis server.
Moving from Amazon SES to mailgun.
Fabfile
Turning off autocomplete.
Fixing new redis server.
Switching from 64 free sites to 12 to handle load.
* master:
Showing feed pushes in statistics.
Instrumentation to count feed pushes.
Migration to fix starred stories with incorrectly double-encoded url strings.
Fixing bug around missing feed links being checked for length.
Conflicts:
apps/rss_feeds/views.py
* master:
Adding MongoDB logging for debug.
Being far kinder during feed exception handling and showing users error text. Cannot believe this wasn't there.
Conflicts:
media/css/reader.css
templates/base.html
utils/json_functions.py
