* master:
Adding in model for upcoming highlights (so non-highlights branches dont crash on new data
No future dating mark read dates due to stories being future dated.
* 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:
Adding two dependencies for postlight's mercury parser.
Updating minimist node dependency.
Updating dependencies
Removing additional traces of Google Reader.
Upgrading to latest node.
Updating flask requirements.
Removing Google Analytics. Should've done this 7 years ago.
Renaming feedfinder and feedfinder2.
* 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: (104 commits)
Fixing issue around JSON feeds with missing fields.
Adding smart crop to image proxy thumbnails.
Adding secret signature to proxied image urls and thumbnails. Ready to launch!
Don't hexify url
Handling a mix of image proxy options.
Handling a mix of image proxy options.
Adding imageproxy and switching from camo. Built for #1162.
Adding back in types
Undoing commit that changed story dates.
Adding in imageproxy nginx conf.
Moving mongo config log.
#1162 (widget)
#1162 (widget)
#1162 (widget)
#1162 (widget)
#1162 (widget)
#1268 (appearance changes)
Fixing tag alignment issue in FF.
Handle no page
Handle no page
...
