* 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.
...
* django1.7:
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.
* 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.
...
