* 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.
# 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.
