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
..
cabletrace.js	Initial work on a cable tracing modal	2018-10-29 16:45:20 -04:00
connection_toggles.js	Separate device component lists into discrete views	2020-11-13 15:00:12 -05:00
forms.js	Restore 'brief' parameter (regression from 7e20beae7e)	2021-04-02 11:37:09 -04:00
interface_filtering.js	Fixes #5499: Fix filtering of displayed device/VM interfaces by regex	2020-12-18 15:02:52 -05:00
job_result.js	review updates	2020-07-06 02:00:16 -04:00
secrets.js	Closes #2638: Copy Button for Secrets (#2860)	2019-02-21 13:26:19 -05:00
tableconfig.js	Closes #6088: Improved table configuration form	2021-04-12 10:46:32 -04:00