* 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:
Rejiggering autocomplete to only include > 10 subs.
Have RegisterProgressFragment finished via noHistory Manifest option rather than hackish finish with Fragment. Improve comments
Fix registration regression bug caused by #151
Fix for #159 force close during add feed (auto complete) now that is is enabled again
Remove log call from DeleteFeedFragment
Fix#140. Delete feed now works and confirmation dialog has been added.
Fix issue where selection within stories was hidden
* 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:
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
* 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.
