Marco Ceppi bb7191e953 Merge upstream v2.8.5 into develop ...

# Conflicts:
#	netbox/dcim/api/serializers.py
#	netbox/dcim/models/__init__.py
#	netbox/extras/constants.py
#	netbox/netbox/admin.py
#	netbox/templates/users/base.html
#	requirements.txt

2020-05-27 15:44:47 -04:00

..

api

Update serializer context assignment for DRF 3.11

2020-03-30 12:39:15 -04:00

management

Added webhook_receiver management command

2020-04-07 13:37:48 -04:00

migrations

Merge upstream v2.8.5 into develop

2020-05-27 15:44:47 -04:00

models

Closes #4672: Set default color for rack and devices roles

2020-05-26 09:36:27 -04:00

plugins

Use packaging.version.parse directly

2020-04-10 11:18:01 -04:00

templatetags

Merge branch 'develop' into 4651-csrf-in-plugintemplateextension

2020-05-26 09:02:39 -04:00

tests

Merge upstream v2.8.5 into develop

2020-05-27 15:44:47 -04:00

__init__.py

Closes #3408: Remove WEBHOOKS_ENABLE configuration setting

2019-12-06 11:52:28 -05:00

admin.py

Fixes #4458: Remove custom admin site to avoid conflict with django-rq 2.3.0

2020-04-07 10:17:34 -04:00

apps.py

Clean up unused imports

2020-02-14 12:04:56 -05:00

choices.py

Add http_method field to Webhook

2020-02-24 20:42:24 -05:00

constants.py

Revert "implemented registry for extras model functionality"

2020-03-15 00:25:46 -04:00

filters.py

Ensure all model FilterSets support the 'id' field

2020-05-06 12:33:52 -04:00

forms.py

Fixes #4525: Allow passing initial data to custom script MultiObjectVar

2020-05-26 15:34:29 -04:00

middleware.py

Disconnect post_save & pre_delete signals after the response has been received

2020-02-24 12:42:51 -05:00

querysets.py

Fixes #3886: Config context cluster (group)

2020-01-26 10:53:58 +00:00

registry.py

Raise specific exceptions

2020-03-18 13:15:22 -04:00

reports.py

Fixes #4646: Correct UI link for reports with custom name

2020-05-15 09:13:51 -04:00

scripts.py

Merge branch 'develop' into develop-2.8

2020-03-27 12:53:55 -04:00

signals.py

Fix errant changelog entries when executing a script without committing

2019-08-26 11:59:38 -04:00

tables.py

#492: Extend extras tables

2020-04-29 11:03:49 -04:00

urls.py

Fixes #4094: Convert unnecessary regular expressions to strings in URL patterns

2020-02-05 16:12:48 -05:00

utils.py

Refactor extras.models

2020-05-07 16:59:27 -04:00

views.py

Fixes #4593: Fix AttributeError exception when viewing object lists as a non-authenticated user

2020-05-06 23:44:06 -04:00

webhooks_worker.py

Closes #4502: Enable configuration of proxies for outbound HTTP requests

2020-04-30 14:59:13 -04:00

webhooks.py

Fix 4549 webhook body encode in utf-8

2020-04-29 01:48:53 -04:00