* docker_django3.1: (117 commits)
Adding docker to node scripts.
Removing node_modules from repo
Whoops
Better logging for broken paypal ipns.
Adding RSS Tracker for Windows to Goodies.
Refactoring socketio so real-time works around username restrictions.
Socket.IO v3 on the server too.
Switching to Socket.IO v3.
Haproxy splitting for socketio 3
Socket.io 3
Handling missing feed.
Only nb.local.com uses ports for websockets.
Adding GrazeTEN
Full node install on setup.
Updating toprc
correct newsblur to newsblur_web in tasks
Changing mongodb server.
Fixing toprc
Attempting to collect queries for 1% of requests by using DEBUG.
Fixing mongo install.
...
* master: (22 commits)
Whoops
Better logging for broken paypal ipns.
Adding RSS Tracker for Windows to Goodies.
Refactoring socketio so real-time works around username restrictions.
Socket.IO v3 on the server too.
Switching to Socket.IO v3.
Haproxy splitting for socketio 3
Socket.io 3
Handling missing feed.
Only nb.local.com uses ports for websockets.
Adding GrazeTEN
Full node install on setup.
Updating toprc
Changing mongodb server.
Fixing toprc
Attempting to collect queries for 1% of requests by using DEBUG.
Fixing mongo install.
Recalculating premium expiration to take into account forced expirations after gifts.
Fixing never expire -> 1 year
Adding 1 year expire to admin.
...
* 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.
...