checktheroads eb55761c38 Merge branch 'feature' of https://github.com/netbox-community/netbox into feature ...

# Conflicts:
#	netbox/project-static/js/forms.js
#	netbox/templates/dcim/location.html
#	netbox/templates/generic/object_list.html

2021-04-22 19:19:03 -07:00

..

circuits

fix confirmation form styles

2021-04-21 13:19:08 -07:00

dcim

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

2021-04-22 19:19:03 -07:00

extras

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

2021-04-22 19:19:03 -07:00

ipam

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

2021-04-22 19:19:03 -07:00

media

Tweak gitignore to include devicetype-images directory

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

netbox

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

2021-04-22 19:19:03 -07:00

project-static

fix bulk edit styles

2021-04-22 18:58:36 -07:00

reports

…

scripts

Remove extraneous demo scripts

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

secrets

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

2021-04-14 11:30:15 -07:00

templates

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

2021-04-22 19:19:03 -07:00

tenancy

Reorganize base TestCase classes

2021-04-14 14:22:58 -04:00

users

Use ContentTypeChoiceField for all ContentType fields

2021-04-02 10:55:16 -04:00

utilities

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

2021-04-22 19:19:03 -07:00

virtualization

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

2021-04-22 19:19:03 -07:00

generate_secret_key.py

Fix how SECRET_KEY is generated

2021-01-24 21:20:55 +01:00

manage.py

…