* master: (59 commits)
Correctly limiting stories in rss feeds.
Correctly limiting stories in rss feeds.
Correctly limiting stories in rss feeds.
Handling errors with sharing stories.
Android 4.0.0b1.
Handling removed stories from mark as unread.
Bump version number to force DB reset.
Make read-story retention default off.
Tweak status LnF.
Adding extra narrow content setting to fix sideoptions width.
Swap in cached images if offline.
Don't imply unread status from unread hash list if not premium.
Clean up noisy image loader logging.
Don't drop pending feed loads during sync.
Fixing unread count sizing on folder headers.
Fix binding of multi-feed API responses.
Fix loading of saved stories to use normal stories table.
Option to enable image caching.
Image prefetching.
More efficient thread re-use in sync service.
...
* master: (31 commits)
Fixing login screen for Reeder.
Fixing login screen for Reeder.
Explicit viewport.
Explicit viewport.
Explicit viewport.
Explicit viewport.
Adding viewport to login/signup screen.
Set source_used_id correctly when sharing from a blurblog (#551)
Adding debug option to all text importers.
Adding user_id to every response.
Adding WAI-AREA support for <article> to support LiveJournal.
Fixing last few font size changes for new feed title font styler.
Boosting readability's ability to read Medium posts.
Adding feed font size. Configures both story titles and feed titles. This one's for you @theromit.
Probably not a bug. Probably Adblock.
Adding autosize to share textbox.
Hiding mark as read button when searching.
Fixing images in tutorial.
Removing unnecessary inset box shadow on header elements.
Further correcting OAuth spacing on mobile.
...
* 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:
Updating tweepy to v2.2.
Switching starring story unique index parameter.
Android v3.6.1 has new font sizes.
Fixing race condition on starring stories.
Typo on exception.
Typo on exception.
Fixing the unstarring bugs.
Discrete text sizes rather than linear, new XXL size. (#474, #392)
Fixing log.
Cutting trim log in half.
Turning off chance for cleanup. Everybody gets a cleanup.
No need for progress on trim.
Handling users who only read feeds to which they are subscribed.
Fixing inaccurate counts.
Sending a max of 1,000 read stories at a time.
Adding logging and correcting logic error in auto trim.
Cleaning up user read stories.
Conflicts:
apps/reader/views.py
