* master: (75 commits)
Adding template for Turn Touch end campaign email.
Fixing images in email notifications.
Bingo, found a bug when marking odler stories as read in a folder.
Updating fonts.
Android v5.1.0b1.
Turning S3 back on.
enroll more debug logging
enroll more debug logging
fix log levels, enroll more debug logging
enroll more loggin in feedback logger
enroll more logging in feddback system
log capture and email reporting
Adding failure handling for boto.
Fixing horrible session loss bug. Turns out the django-redis-sessions library changed timeout behavior, from silently retrying to silently failing. Adding necessary SESSION_* vars.
Better handling of booleans on /reader/feeds.
Fixing redis bootstrap
Add Firefox to story browser list
Dashboard should not show old stories.
Faking user agent when rss bans NewsBlur.
Better recording of non-200/300 status codes on feed fetch.
...
* master: (801 commits)
Fixing styling of tags and font sizing in story header on web.
Use ReadingAction for mute/unmute.
Fixing drag on saved stories and social stories. Also fixing background color on profile activities.
Fixing username sizing on blurblog. Thanks to J. Leeuwen for finding this.
Fixing bug when deleting feeds.
Adding preference for left-swiping feed titles to either show notifications (default) or trainer (old default).
Alphabetizing notifications.
Saving notifications on iOS. Just need to update local feed dict on save.
Mutli select segmented control. Now just need to save and we're done.
Selecting correct notification filter. Notification type will need a custom segmented control to handle multiple selections.
Finished styling notifications on ios. Needs web hookup.
Feeds are now loaded in notifications table. Now to build the cells and save notification types.
Stubbing in notifications table. Now needs notification feed cells.
Stubbing in notifications editor on iOS.
Hiding notifications from non-staff on web in feed popover.
Android v5.0.0b2
Fixing date/author/tags size on web.
Only include active feeds when marking a folder as read.
clarify ambiguous preview option
fix story row bordering (#963)
...
This was a curly one! I also fixed a bunch of Xcode 8 warnings (for
non-third-party code; I'd like to fix the third-party ones to get to
zero warnings, but don't know how you feel about that).
Funnel all HTML loading through -loadHTMLString:.
Cache base URL (which is always the same) in a static variable instead of computing it different ways and putting in an instance variable temporarily.
Use more intention-revealing variable names.
Only set hasStory when we’re actually loading the story itself.
Only set the font size and line spacing once, in webViewDidStartLoad, because the DOM is always set up by then in my experience.
Only bother to set font size and line spacing if we’re loading a (full) story.
Show the Web view when a full story *starts* to load, as sometimes it may not complete but you still want to see a partially loaded story. (Fixes an intermittent issue with AnandTech; see https://getsatisfaction.com/newsblur/topics/anandtech-straight-up-doesnt-load-on-the-ios-app)
Don’t try to subclass UIActivityItemProvider as well as implement UIActivityItemSource - the latter is better suited for what NewsBlur wants to do (provide different items based on activity type).
Provide the URL as a separate item where possible; only return strings from UIActivityItemSource.
Crashed due to the -addKeyCommand: method not being available before
iOS 9. @nriley may want to implement some alternative solution (e.g.
overriding the -keyCommands method), but this fixes the crash.
