Jeremy Stretch 57fc6a3f50 Merge branch 'develop' into v2-develop ...

Conflicts:
	netbox/netbox/settings.py
	netbox/netbox/urls.py
	requirements.txt

2017-04-06 17:01:13 -04:00

..

inc

Merge branch 'develop' into v2-develop

2017-03-23 17:14:41 -04:00

console_connections_import.html

…

console_connections_list.html

…

consoleport_connect.html

Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade

2017-03-30 15:40:00 -04:00

consoleport_delete.html

…

consoleport_disconnect.html

…

consoleserverport_connect.html

Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade

2017-03-30 15:40:00 -04:00

consoleserverport_delete.html

…

consoleserverport_disconnect.html

…

device_bulk_add_component.html

…

device_bulk_edit.html

…

device_component_add.html

Closes #105: Interface groups (#919)

2017-02-27 16:52:13 -05:00

device_edit.html

…

device_import_child.html

…

device_import.html

Rack assignment is optional for devices

2017-03-23 15:36:24 -04:00

device_inventory.html

Renamed Module to InventoryItem (prep for #824)

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

device_list.html

…

device_lldp_neighbors.html

RPC API fixes

2017-03-21 17:24:16 -04:00

device.html

Added image attachments to sites and devices

2017-03-31 15:19:44 -04:00

devicebay_delete.html

…

devicebay_depopulate.html

…

devicebay_populate.html

…

devicerole_list.html

…

devicetype_bulk_edit.html

…

devicetype_component_add.html

…

devicetype_edit.html

…

devicetype_list.html

…

devicetype.html

…

interface_bulk_edit.html

…

interface_connections_import.html

…

interface_connections_list.html

…

interface_delete.html

…

interfaceconnection_delete.html

…

interfaceconnection_edit.html

Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade

2017-03-30 15:40:00 -04:00

interfacetemplate_bulk_edit.html

…

inventoryitem_delete.html

Renamed Module to InventoryItem (prep for #824)

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

ipaddress_assign.html

Only show Custom Fields on IP Address Assign Page if custom fields are set against the ip address (#1031)

2017-04-04 11:37:20 -04:00

manufacturer_list.html

…

platform_list.html

…

power_connections_import.html

…

power_connections_list.html

…

poweroutlet_connect.html

Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade

2017-03-30 15:40:00 -04:00

poweroutlet_delete.html

…

poweroutlet_disconnect.html

…

powerport_connect.html

Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade

2017-03-30 15:40:00 -04:00

powerport_delete.html

…

powerport_disconnect.html

…

rack_bulk_edit.html

…

rack_edit.html

…

rack_import.html

…

rack_list.html

…

rack.html

Merge branch 'develop' into v2-develop

2017-04-06 17:01:13 -04:00

rackgroup_list.html

…

rackreservation_list.html

Closes #1052: Added rack reservation list and bulk delete views

2017-04-06 16:26:48 -04:00

rackrole_list.html

…

region_list.html

Merged develop

2017-02-28 16:10:53 -05:00

site_bulk_edit.html

…

site_edit.html

Merged develop

2017-02-28 16:10:53 -05:00

site_import.html

Merged develop

2017-02-28 16:10:53 -05:00

site_list.html

…

site.html

Closes #578: Show topology maps not assigned to a site on the home view

2017-04-05 17:33:39 -04:00