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

..

circuits

Fixes #4613: Fix tag assignment on config contexts (regression from #4527)

2020-05-13 10:28:48 -04:00

dcim

Merge upstream v2.8.5 into develop

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

extras

Merge upstream v2.8.5 into develop

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

ipam

Fixes #4649: Fix interface assignment for bulk-imported IP addresses

2020-05-15 09:44:00 -04:00

media

Tweak gitignore to include devicetype-images directory

2020-02-20 13:42:23 -05:00

netbox

Merge upstream v2.8.5 into develop

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

project-static

Fixes #4613: Fix tag assignment on config contexts (regression from #4527)

2020-05-13 10:28:48 -04:00

reports

Restore reports directory

2018-08-07 13:47:36 -04:00

scripts

Remove extraneous demo scripts

2019-09-23 09:21:38 -04:00

secrets

Fixes #4613: Fix tag assignment on config contexts (regression from #4527)

2020-05-13 10:28:48 -04:00

templates

Merge upstream v2.8.5 into develop

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

tenancy

Fixes #4613: Fix tag assignment on config contexts (regression from #4527)

2020-05-13 10:28:48 -04:00

users

Ignore clearing of invalid user config keys

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

utilities

Merge upstream v2.8.5 into develop

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

vapor

Merge upstream v2.8.5 into develop

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

virtualization

Fixes #4613: Fix tag assignment on config contexts (regression from #4527)

2020-05-13 10:28:48 -04:00

generate_secret_key.py

Fixes #1092: Increase randomness in SECRET_KEY generation tool

2017-04-21 10:32:10 -04:00

manage.py

Initial push to public repo

2016-03-01 11:23:03 -05:00