* django1.7: (108 commits)
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.
No ECMAScript 6 yet. Wait until it's the only change.
Mark read button
Older httplib2 doesn't have setuptools legacy issue.
Upgrading redis session.
Upgrading redis session.
Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary?
Better newsletter check
Adding allowlist (whitelist) for RSS Bridge.
Removing last vestigates of Google Analytics.
New spinners.
Cleaning up profile modal.
Scratch that, better bright.
Darkening light blue links and graphs.
Better cross browser watching for changing theme.
...
* 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)
...
