Samuel Clay 058154c913 Merge branch 'master' into highlights ... * 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. ...		2020-07-07 16:28:13 -04:00
..
common	Merge branch 'master' into highlights	2020-07-07 16:28:13 -04:00
models	Merge branch 'master' into highlights	2020-07-07 16:28:13 -04:00
payments	Fixing premium option in stripe form.	2013-07-04 11:53:01 -07:00
reader	Fixing broken auto-dark theme.	2020-06-24 15:28:22 -04:00
social_page	Updating to jquery 3.5.1 (fixes #1324). Everything looks good, who knows what's broken though.	2020-06-09 15:37:04 -04:00
views	Merge branch 'master' into highlights	2020-07-07 16:28:13 -04:00
welcome	Refactoring welcome screen to fix input alignment issue.	2020-07-06 19:57:30 -04:00