* 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.
...
* master:
Stubbing in profile tests.
Adding nginx.local.conf
Adding original text and original story to API docs.
Adding a smarter wakeup for real-time to handle cases where a laptop is re-opened but real-time is not immediately reestablished.
* master:
New icon for Infrequent Site Stories.
Allowing selection in private notes.
Autoresizing private notes field.
For #1035: Adding private notes to saved stories.
Adding REDIS_SESSIONS to local-settings template.
Adding user notes. Unverified and needs saved confirmation.
* master: (161 commits)
Refactoring welcome screen to fix input alignment issue.
Fixing login rotation.
Adding cookies to path inspector.
Upgrading httplib2.
Removing dupe db log.
Not every story is from a feed.
Styling background colors for newsletters.
Styling more newsletter elements.
Using the correct attribute.
Typo in template
Attempting to style newsletters in dark mode.
Loading dark theme if selected on load.
Adding scrollbar colors.
Using request body for ios subscription.
Specifying SESSION_SERIALIZER, which changes from PickleSerializer to JsonSerializer in django 1.5 to 1.6.
Fixing broken auto-dark theme.
Increasing contrast for unread counts.
Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
Cleaning up Twitter lists.
Updating next/previous buttons and search icon.
...
