* django3.0: (184 commits)
Removing log override
Moving logging over to the newsblur log.
Fixing search indexer background task for new celery.
Attempting to add gunicorn errors to console/log.
Better handling of missing subs.
Handling missing user sub on feed delete.
Correct encoding for strings on systems that don't have utf-8 as default encoding.
Writing in the real urllib3 dependency for requests.
Upgrading requests due to urllib3 incompatibility.
Login required should use the next parameter.
Upgrading django oauth toolkit for django 1.11.
Handling newsletters with multiple recipients.
Extracting image urls sometimes fails.
Handling ajax errors in json views.
Adding timeouts to most outbound requests.
Sentry SDK 0.19.4.
Removing imperfect proxy warning for every story.
Found four more GET/POST crosses.
Feed unread count may need a POST.
Namespacing settings.
...
* django1.11: (152 commits)
request.raw_post_data -> request.body (django 1.6)
Upgrading pgbouncer to 1.15.0.
Finishing off Postgresql 13 upgrade.
Upgrading to Postgresql 13.
Ubuntu 20.04
Fixing supervisor path issues
Upgrading setuptools
Fixing flask
Handling over capacity for twitter.
Max length for image_urls.
Properly filtering newsletter feeds.
Fixing issue with text importer on feed-less urls.
Removing dependency, fixing encoding issue for pages.
Fixing DB Monitor.
Updating User Agent for all fetchers.
Ignoring VSCode.
Fixing DB Monitor.
Updating User Agent for all fetchers.
Ignoring VSCode.
Fixing Statistics by fixing how timezones are handled.
...
* django1.9: (122 commits)
Fixing OAuth connect.
Fixing various django1.9 issues, mainly around templates.
BASE_DIR
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.
Django 1.9.13.
De-vendorizing django-paypal, adding to requirements.txt.
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:
Using user's username on signup if no password.
Using user's username on signup if no password.
Fixing passwords if left blank.
Patching Django 1.5 to handle underscores in subdomains.
Allowed hosts
Allowed hosts
If not active subs, turn off real-time.
If not active subs, turn off real-time.
Skipping real-time fetch for non-premium active feeds.
Upgrading django 1.5 manage.py.
Upgrade to django 1.5 script. Also handling story lookups with objectids.
Updated Django to always use the latest 1.5 version. Updated django-redis-session to latest version.
Moving HAProxy's config to secrets so I can set a password.
Allowing_hosts for django 1.5.
Upgrading django from 1.3 to 1.5.
Keep Raven from making settings puke.
Added django-redis-sessions to requirements.
Added a check for testing the email address provided during registration and throwing an error if the email address is already associated with an existing account.
Adding revsys fab command.
Froze requirements to make installation a bit easier.
Conflicts:
templates/reader/dashboard.xhtml
templates/social/social_page.xhtml
* master: (589 commits)
Adding delete user flow. About time, since I'm sick of doing this myself.
Deractivating premiums.
Adding a lock for the intelligence slider for focus stories. If the user selects focus and there are actually focus stories, lock it for the future when there are no unread focus stories.
Uppiung the find next unread story titles page limit from 12 to 50.
Hiding folders with no unread stories in Unread/Focus mode.
Adding autocomplete to emailing a story dialog.
Using queue for scheduling feed fetches on load.
Renaming celerybeat supervisor task.
Fixing insta-fetching.
Attempting to correctly save duplicate feeds.
Adding tons of logging (especially user-facing) to feed exception handling. Much much better feed address and link fetch history.
New enterprise ios build includes full training.
Changing intelligence training on social feeds to apply to original feed as well.
Using a popover for training on the iPad. Also adding the train button to the bottom of every story.
Finishing training on iPad. Works in river too. Just need to test social and it's shipping.
Fixing title selectin bug when the title was too short to register the selection loupe.
Training feeds and stories in feeds. Needs testing on ipad, in river, and on social.
Finish look and feel of ios training for both story and feed. Just need to send requests, redraw intelligence, recount and reclassify stories, and update scores. All already written to support inline training.
A few more log color tweaks.
Adding clean stories task. Updating log colors.
...
Conflicts:
.gitignore
apps/reader/views.py
apps/social/views.py
templates/social/social_page.xhtml
templates/social/social_story.xhtml
templates/social/story_comments.xhtml
