Jeremy Stretch b01bf6089c Merge branch 'develop' into v2-develop ...

Conflicts:
	netbox/dcim/forms.py
	netbox/dcim/views.py
	netbox/ipam/forms.py
	netbox/templates/_base.html
	netbox/utilities/views.py

2017-04-13 15:42:50 -04:00

..

consoleport.html

#878: Layout tweaks

2017-04-13 15:09:08 -04:00

consoleserverport.html

#878: Layout tweaks

2017-04-13 15:09:08 -04:00

device_header.html

Closes #198: Support for rackless devices (#902)

2017-02-17 14:48:00 -05:00

device_import_header.html

Standardized template names

2017-01-05 15:31:41 -05:00

device_table.html

Re-implemented method for bulk editing/deleting all objects within a filtered queryset

2017-01-20 16:42:11 -05:00

devicebay.html

#878: Layout tweaks

2017-04-13 15:09:08 -04:00

devicetype_component_table.html

Only display "select all" button if there are two or more items

2016-12-21 17:26:25 -05:00

interface.html

Merge branch 'develop' into v2-develop

2017-04-13 15:42:50 -04:00

inventoryitem.html

Renamed Module to InventoryItem (prep for #824)

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

poweroutlet.html

#878: Layout tweaks

2017-04-13 15:09:08 -04:00

powerport.html

#878: Layout tweaks

2017-04-13 15:09:08 -04:00

rack_elevation.html

Rack reservations (#900)

2017-02-16 13:46:58 -05:00

service.html

Standardized the use of return_url for ObjectDeleteView

2017-01-18 13:30:19 -05:00