* master: (196 commits)
Adding count to activity for exported OPML, for #1646.
Submitting iOS v11.1 to the App Store.
Showing OPML backup exports and imports in activity popover. Closes#1646.
Don't accept anything under /api/* unless explicit. This would've prevented the #1575 url miscommunication by returning a 404.
/api/add_url for #1575.
#1607 (widget is slow to reload)
#1575 (include a subscribe to site page on the share sheet)
Accepted GET or POST for /api/add_site. For #1575.
#1575 (include a subscribe to site page on the share sheet)
#1575 (include a subscribe to site page on the share sheet)
Build 135
Found another strict variable reference.
#1515 (add private save to sharing extensions)
#1597 (account deletion)
#1607 (widget is slow to reload)
#1607 (widget is slow to reload)
Ignoring spurious server error when logging in as another user
#1607 (widget is slow to reload)
#1637 (moving Delete this site in story detail menu)
#1641 (folder highlight does not deactivate upon return)
...
* master: (72 commits)
Missing import
Correctly decoding shared stories in RSS feed.
Adding scroll to feed and story options popover (Style menu).
Magazine view blog post.
Refactoring story content preview with newlines preserved.
Boosting db profiling from 1% to 5%.
Ignore data uris for widget, they are never the big images
Wait to strip data uri header until it's time.
Moving encoding
Don't double encode base64 images for widgets.
Preserving paragraphs in magazine and grid views.
Fixing bad instrumentation on mongo and redis logs.
Wrong url for db profiler.
Let's try showing only single feeds in the DB profiler to see if it's better at showing abnormalities with less noise.
Fixing strict bug where wasn't defined.
Showing grid image previews. Not sure how this ever worked before.
Grid has image if found already.
Showing grid image on load if youtube
Only monitor river_stories for db times
Not hitting a db shouldnt be colored any differently than a small value.
...
* django1.11: (220 commits)
Fixing Statistics by fixing how timezones are handled.
Checking the 'credit' field if author not found. Works for TechRepublic, which I suspect is a one off.
Handling multiple newsletter feeds.
Attempting a fix of stories taking too long to sort while counting unreads.
Fixing newsletter search.
Fixing newsletter search.
Newsletters feeds now de-duplicate based on sender email as well as sender name. This should cut down on duplicates.
Android v10.1.1.
Fixing API page.
Ignoring cache for homepage user.
Fixing both Stripe form and Login form.
Handling missing user during auth.
Gotta recreate empty_values somehow
Going back on AllowAllUsers backend, as it doesn't work with django 1.5 authentication sessions.
Going back and forth on this but without AllowAllUsersModelBackend, then is_active=False won't allow authentication.
De-vendorizing django-paypal
Vendorizing paypal
Re-vendorizing django-paypal until django 1.11 upgrade is complete.
Wrong fix for missing tagline. SHould instead create a FeedData.
Fixing missing tagline error.
...
