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

# Conflicts:
#	netbox/dcim/tables/template_code.py
#	netbox/netbox/forms.py
#	netbox/templates/dcim/cable_connect.html
#	netbox/templates/dcim/consoleport.html
#	netbox/templates/dcim/consoleserverport.html
#	netbox/templates/dcim/device.html
#	netbox/templates/dcim/device/base.html
#	netbox/templates/dcim/device_edit.html
#	netbox/templates/dcim/interface.html
#	netbox/templates/dcim/rack.html
#	netbox/templates/dcim/rack_edit.html
#	netbox/templates/dcim/site.html
#	netbox/templates/extras/configcontext.html
#	netbox/templates/extras/objectchange.html
#	netbox/templates/generic/object.html
#	netbox/templates/inc/nav_menu.html
#	netbox/templates/ipam/ipaddress_edit.html
#	netbox/templates/ipam/vrf.html
#	netbox/utilities/templates/buttons/export.html

2021-03-17 22:02:43 -07:00

..

device

Initial work on #151: Object journaling

2021-03-16 15:00:08 -04:00

inc

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

2021-03-17 22:02:43 -07:00

trace

begin bootstrap 5 migration, update templates

2021-03-13 02:19:42 -07:00

bulk_disconnect.html

Fixes #2573: Fix bulk console/power/interface disconnections

2018-11-08 15:04:34 -05:00

cable_connect.html

bootstrap 5 template updates

2021-03-15 08:54:01 -07:00

cable_edit.html

Clean up generic view templates

2020-11-11 16:58:29 -05:00

cable_trace.html

Rename parent attribute on CableTerminations to parent_object

2021-03-05 13:06:21 -05:00

cable.html

bootstrap 5 template updates

2021-03-13 11:16:29 -07:00

connections_list.html

bootstrap 5 template updates

2021-03-13 11:16:29 -07:00

consoleport_delete.html

…

consoleport.html

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

2021-03-17 22:02:43 -07:00

consoleserverport_delete.html

…

consoleserverport.html

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

2021-03-17 22:02:43 -07:00

device_component_add.html

fix device & device component templates

2021-03-14 17:26:33 -07:00

device_component_edit.html

Clean up generic view templates

2020-11-11 16:58:29 -05:00

device_component.html

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

2021-03-17 22:02:43 -07:00

device_edit.html

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

2021-03-17 22:02:43 -07:00

device_import_child.html

Clean up generic view templates

2020-11-11 16:58:29 -05:00

device_import.html

Clean up generic view templates

2020-11-11 16:58:29 -05:00

device_list.html

update templates to bootstrap 5 classes

2021-03-14 17:26:56 -07:00

device.html

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

2021-03-17 22:02:43 -07:00

devicebay_delete.html

…

devicebay_depopulate.html

…

devicebay_populate.html

bootstrap 5 template updates

2021-03-17 13:00:20 -07:00

devicebay.html

bootstrap 5 template updates

2021-03-17 13:00:20 -07:00

devicetype_component_add.html

bootstrap 5 template updates

2021-03-17 13:00:20 -07:00

devicetype.html

begin bootstrap 5 migration, update templates

2021-03-13 02:19:42 -07:00

frontport.html

Closes #3648: Mark cable termination models as connected without attaching a cable

2021-03-01 21:34:42 -05:00

interface_delete.html

…

interface_edit.html

Clean up parent/LAG interface form validation

2021-03-05 14:13:03 -05:00

interface.html

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

2021-03-17 22:02:43 -07:00

inventoryitem_bulk_delete.html

Clean up generic view templates

2020-11-11 16:58:29 -05:00

inventoryitem_delete.html

Renamed Module to InventoryItem (prep for #824)

2017-03-21 12:54:08 -04:00

inventoryitem.html

Add custom field support for device component models

2021-03-01 13:07:25 -05:00

powerfeed.html

begin bootstrap 5 migration, update templates

2021-03-13 02:19:42 -07:00

poweroutlet_delete.html

…

poweroutlet.html

Closes #3648: Mark cable termination models as connected without attaching a cable

2021-03-01 21:34:42 -05:00

powerpanel.html

Closes #5895: Rename RackGroup to Location

2021-03-03 13:30:33 -05:00

powerport_delete.html

…

powerport.html

Closes #3648: Mark cable termination models as connected without attaching a cable

2021-03-01 21:34:42 -05:00

rack_edit.html

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

2021-03-17 22:02:43 -07:00

rack_elevation_list.html

Fixes #5473: Fix alignment of rack names in elevations list

2020-12-16 09:26:22 -05:00

rack.html

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

2021-03-17 22:02:43 -07:00

rackreservation.html

Introduce generic object template

2021-03-02 15:58:33 -05:00

rearport.html

Closes #3648: Mark cable termination models as connected without attaching a cable

2021-03-01 21:34:42 -05:00

site.html

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

2021-03-17 22:02:43 -07:00

virtualchassis_add_member.html

Rename base template

2020-04-10 10:21:02 -04:00

virtualchassis_add.html

Closes #5892: Introduce SiteGroup model (#5937)

2021-03-08 13:28:53 -05:00

virtualchassis_edit.html

Replace Glyphicons with Material Design

2020-11-06 14:49:14 -05:00

virtualchassis_remove_member.html

Added virtual chassis member remove view

2018-02-01 12:49:23 -05:00

virtualchassis.html

bootstrap 5 template updates

2021-03-15 08:54:01 -07:00