* master:
Moving classifiers when recreating destroyed feeds.
Code to recreateaccidentally destroyed feeds.
Adding SSL certificate assembly fab command.
Skip saved feeds which have fake unread counts.
Fixing saved story view for users with preference to open first unread story, thereby switching them out of saved mode and into unread mode.
Adding copy_db_settings to fabfile.
Fixing specified image sizes.
Only premiums users can share multiple stories from a single feed per day.
Faster delete user (for combating spam).
Boosting XL font size.
* master: (492 commits)
Fixing renewal dialog.
Better feed count for muting.
Preventing dupe stories in feed view.
Adding mute feeds feature for premium users.
Adding auto-activate for flat feeds.
Submitting v4.1.0.
Last beta of ios 4.1 before release.
Showing refresh notifier when returning to app.
Fixing urls for folders with dashes in the title.
Removed transition.
Transitioning from tag to tag/feed_id.
Max of 3 updates per fetch.
Upgrading mongodb mms agent.
Showing saved stories explainer for empty saved stories.
Removing mark read button in story titles bar when on saved view.
Fixing updates_off in tasks.
Adding updates_off run-time setting for handling large spikes of updates.
Draining feeds also clears out error feeds.
Fixing errors with missing story content from ifttt.
OMG, I shipped a 3 second sleep. Doh!
...
Conflicts:
apps/reader/models.py
* master: (78 commits)
Adding 401 status code for invalid token on user/info.
Adding new preference for 24 hour clock. Moving to client-side generated dates.
Adding IFTTT logging.
All dates in iso 8601 format.
Use strings for feed_id.
Fixing unread trigger for IFTTT.
Updating shared story ifttt entries.
Fixing ReadKit flat folders by leaving out removed feeds.
Adding handlers for all stories.
Fixing ifttt timestamp.
Adding share story action for IFTTT.
Adding site title, website, and address to each IFTTT trigger.
Adding share username to ifttt share trigger.
Upping access token expiration to 10 years.
Using TitleCase instead of snake_case.
Fixing exception dialogs to correctly update on fixed addresses and links.
New saved story as per IFTTT action.
Updating IFTTT urls.
IFTTT action for new subscriptions.
Adding folder list for dynamic action fields.
...
* master:
Adding Pinterest.
Tightening up comments line height.
Correctly render DB changes in folder list more quickly.
Fixing empty story hashes.
Cleaning up kill utils.
Clean up ItemList subclasses.
Clean up ItemsList subclass tagging and lifecycle.
Fix backwards error catch.
Refactor page-crawling in *Reading activities to fix looping. (#387)
* master:
Better limit on redis logging.
Fixing persistance of redis keys due to redis' RESTORE command using a millisecond TTL, not a second TTL.
Fixing redis issues by pipelining.
* master:
Fixing a couple small bugs.
Fixing subs for socialsubs.
Fixing unread hashes on single feeds.
Fixing redis issue with existing keys beyond a RESTORE.
Fixing socialsub issue.
Adding options popover (and read_filter) to all shared stories and global shared stories.
Only trimming active users.
Fixing issue with wrong subs.
Fixing trim user stories on malformed story hash.
Fixing missig unread ranked stories cache.
Major refactoring of social blurblog. Also adding a new trimmer, but keeping it turned off.
Fixing rstats.
* master:
Fixing massive river bug where stories would abruptly end while paging.
Adding black logo.
Implement part of #207 - add Send To option to context menu in story list view
removed unnecessary and redundant imports.
Putting Google Alerts/News back into rotation.
Port pull request #219 to new repository layout. Adds https on Android to fix#165.
