* 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:
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.
...
* master: (54 commits)
Removing unused merge_feeds command, this is better used in rss_feeds/models.py
Temporarily turn off https only.
Changing color on dark mode cutoff.
Adding dark mode cutoff for blurlogs.
Redirect http to https. Long time coming.
Testing http > https redirect.
Handling broken page importer.
Handling multiple starred stories.
Handling NoAnswer on broken emails.
Overriding story url.
Removing Daily Skip from text importer.
Adding YouTube ToS to ToS.
Adding saved searches to flat feeds for #1298.
6 hour min
6 hour minimum for craigslist
#1292 (dark mode FTUX)
Xcode 11.4 tweaks
#1290 (state restoration)
Fixing premium upgrade form
ios v10.0.2.
...
* master: (218 commits)
Deploying camo https proxy for images.
add title to story sharing
Font tag has attrs too
don't include inactive feeds on unread count
Typo
Handling bs4 attr difference.
Upgrading beautifulsoup for html sanitizing in email newsletters.
http -> https on all emails.
Adding link to specific tweet. Thanks to @ktf for the suggestion.
use system formatted date for non-english locales
Fixing classmethod
Adding stripe history reimport background task.
New screenshots for iOS.
iOS bundle version 104.
iOS: #1208 (iOS 13 support)
iOS bundle version.
iOS: #1210 (hiding on swiping feeds)
iOS: #1171 (autoscroll)
Upgrading to mercury parser v2.1.1 thanks to @mgeraci
iOS: #1171 (autoscroll)
...
* master:
Handling APNS unicode encode errors.
Fixing APNS notifications.
Attempting to corral APNS push notification max sizes due to chinese unicode characters being 3 bytes.
Handling missing user sub folders for IFTTT.
Handling missing original page.
Handling mercury text parsing error.
Fixing issue with double saving of classifier.
