checktheroads ccc44abb79 Merge branch 'feature' of https://github.com/netbox-community/netbox into feature ... # Conflicts: # netbox/dcim/tables/template_code.py # netbox/netbox/views/__init__.py # netbox/project-static/css/base.css # netbox/templates/base.html # netbox/templates/circuits/circuit.html # netbox/templates/circuits/circuittermination_edit.html # netbox/templates/circuits/inc/circuit_termination.html # netbox/templates/circuits/provider.html # netbox/templates/dcim/device.html # netbox/templates/dcim/device/base.html # netbox/templates/dcim/device_component.html # netbox/templates/dcim/devicetype.html # netbox/templates/dcim/inc/device_napalm_tabs.html # netbox/templates/dcim/rack.html # netbox/templates/dcim/site.html # netbox/templates/dcim/virtualchassis.html # netbox/templates/extras/configcontext.html # netbox/templates/extras/object_journal.html # netbox/templates/extras/tag.html # netbox/templates/generic/object.html # netbox/templates/generic/object_list.html # netbox/templates/home.html # netbox/templates/inc/nav_menu.html # netbox/templates/ipam/aggregate.html # netbox/templates/ipam/ipaddress.html # netbox/templates/ipam/prefix.html # netbox/templates/ipam/vlan.html # netbox/templates/ipam/vlangroup_edit.html # netbox/templates/ipam/vlangroup_vlans.html # netbox/templates/secrets/secret.html # netbox/templates/tenancy/tenant.html # netbox/templates/users/api_tokens.html # netbox/templates/virtualization/cluster.html # netbox/templates/virtualization/vminterface_edit.html # netbox/utilities/forms/fields.py # netbox/utilities/templates/buttons/export.html		2021-04-14 11:30:15 -07:00
..
circuits	Fix permissions for cable trace view tests	2021-04-12 16:25:52 -04:00
dcim	Merge branch 'feature' of https://github.com/netbox-community/netbox into feature	2021-04-14 11:30:15 -07:00
extras	Merge branch 'feature' of https://github.com/netbox-community/netbox into feature	2021-04-14 11:30:15 -07:00
ipam	Merge branch 'feature' of https://github.com/netbox-community/netbox into feature	2021-04-14 11:30:15 -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-14 11:30:15 -07:00
project-static	Merge branch 'feature' of https://github.com/netbox-community/netbox into feature	2021-04-14 11:30:15 -07: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	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-14 11:30:15 -07:00
tenancy	Merge branch 'develop' into feature	2021-04-11 13:16:00 -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-14 11:30:15 -07:00
virtualization	Merge branch 'develop' into feature	2021-04-13 16:41:46 -04:00
generate_secret_key.py	Fix how SECRET_KEY is generated	2021-01-24 21:20:55 +01:00
manage.py	Initial push to public repo	2016-03-01 11:23:03 -05:00