Commit graph

14 commits

Author SHA1 Message Date
Samuel Clay
8371c635f7 Merge branch 'master' into django2.0
* master: (27 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.
  ...
2020-12-08 09:09:25 -05:00
Samuel Clay
4bc21931e9 Namespacing settings. 2020-12-05 17:23:31 -05:00
Samuel Clay
3737c13b22 Updating paths for python 3 2020-12-03 14:05:32 -05:00
Jonathan Math
af6db197d5 Merge remote-tracking branch 'origin/django1.6' into django2.0 2020-06-23 00:46:40 -04:00
Jonathan Math
3a0a2c28b8 2to3 utils/*.py 2020-06-19 02:27:48 -04:00
Samuel Clay
e42f3011af Updating emails on monitors. 2020-06-08 15:11:42 -04:00
Samuel Clay
dbf9e838a8 Different ssl cert location. 2020-06-01 17:09:57 -04:00
Samuel Clay
9bfd0a6e82 Adding archive in utils, changing email in disk usage monitor. 2020-06-01 15:37:58 -04:00
Samuel Clay
f534b2bd2a Cleaning up disk usage monitor. 2016-03-16 12:20:16 -07:00
Samuel Clay
7264b6a91d No longer need psutil on monitor. 2016-03-16 11:42:18 -07:00
Samuel Clay
21e5da0ecf Moving to more accurate disk usage monitor. 2016-03-16 11:40:11 -07:00
Samuel Clay
f243f424ae Usage monitor needs correct virtualenv python. 2016-02-09 11:11:19 -08:00
Samuel Clay
bdea41f131 Fixing pythonpath for disk monitor. 2015-02-11 17:37:41 -08:00
Samuel Clay
afee20edca Adding disk usage monitor to all database servers. 2015-02-11 17:30:15 -08:00