Jeremy Stretch 5b43a108bc Merge branch 'develop' into develop-2.1 ...

Conflicts:
	netbox/ipam/models.py
	netbox/netbox/settings.py
	netbox/templates/dcim/inc/interface.html

2017-07-06 13:27:13 -04:00

..

inc

Merge branch 'develop' into develop-2.1

2017-07-06 13:27:13 -04:00

bulk_disconnect.html

Closes #626: Added bulk disconnect function for console/power/interface connections on device view

2017-06-15 14:01:49 -04:00

console_connections_list.html

Fixes #1187: Fixed table pagination by introducing a custom table template

2017-05-16 16:19:55 -04:00

consoleport_connect.html

Fixes #1229: Fix validation error on forms where API search is used

2017-05-25 14:33:50 -04:00

consoleport_delete.html

Initial push to public repo

2016-03-01 11:23:03 -05:00

consoleport_disconnect.html

Initial push to public repo

2016-03-01 11:23:03 -05:00

consoleserverport_connect.html

Fixes #1229: Fix validation error on forms where API search is used

2017-05-25 14:33:50 -04:00

consoleserverport_delete.html

Initial push to public repo

2016-03-01 11:23:03 -05:00

consoleserverport_disconnect.html

Initial push to public repo

2016-03-01 11:23:03 -05:00

device_bulk_add_component.html

Standardized naming of return_url for all object views

2017-01-23 14:07:26 -05:00

device_bulk_edit.html

Fixes #734: Corrected display of device type when editing a device

2016-12-08 09:59:21 -05:00

device_component_add.html

Closes #105: Interface groups (#919)

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

device_edit.html

Added tenant_group/tenant form section to all objects with tenancy

2017-05-11 17:35:20 -04:00

device_import_child.html

Converted site/rack/device import views to new scheme

2017-06-02 14:49:25 -04:00

device_import.html

Converted site/rack/device import views to new scheme

2017-06-02 14:49:25 -04:00

device_inventory.html

Closes #1121: Added asset_tag and description fields to inventory items

2017-06-23 17:05:37 -04:00

device_list.html

Closes #1198: Allow filtering unracked devices on device list

2017-05-18 14:27:07 -04:00

device_lldp_neighbors.html

RPC API fixes

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

device.html

Merge branch 'develop' into develop-2.1

2017-07-06 13:27:13 -04:00

devicebay_delete.html

Initial work on #91: Support for subdevices

2016-07-01 17:34:47 -04:00

devicebay_depopulate.html

Initial work on #91: Support for subdevices

2016-07-01 17:34:47 -04:00

devicebay_populate.html

Standardized naming of return_url for all object views

2017-01-23 14:07:26 -05:00

devicerole_list.html

Replaced most glyphicons with Font Awesome

2016-08-01 13:29:45 -04:00

devicetype_bulk_edit.html

Added headers to all bulk edit tables

2016-09-28 17:20:16 -04:00

devicetype_component_add.html

Standardized naming of return_url for all object views

2017-01-23 14:07:26 -05:00

devicetype_edit.html

Closes #284: Added interface_ordering field to DeviceType

2017-01-06 12:59:49 -05:00

devicetype_list.html

Closes #841: Merged search and filter forms on all object lists

2017-01-24 12:05:39 -05:00

devicetype.html

Combined mgmt and non-mgmt interfaces into same list on device and device type views

2017-06-16 17:13:33 -04:00

interface_bulk_edit.html

#353: Allow bulk editing of interfaces

2016-10-14 16:38:46 -04:00

interface_connections_list.html

Fixes #1187: Fixed table pagination by introducing a custom table template

2017-05-16 16:19:55 -04:00

interface_delete.html

Initial push to public repo

2016-03-01 11:23:03 -05:00

interfaceconnection_delete.html

Initial push to public repo

2016-03-01 11:23:03 -05:00

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

#353: Added bulk editing for InterfaceTemplates

2016-10-19 12:15:54 -04:00

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

Replaced most glyphicons with Font Awesome

2016-08-01 13:29:45 -04:00

platform_list.html

Replaced most glyphicons with Font Awesome

2016-08-01 13:29:45 -04:00

power_connections_list.html

Fixes #1187: Fixed table pagination by introducing a custom table template

2017-05-16 16:19:55 -04:00

poweroutlet_connect.html

Fixes #1229: Fix validation error on forms where API search is used

2017-05-25 14:33:50 -04:00

poweroutlet_delete.html

Initial push to public repo

2016-03-01 11:23:03 -05:00

poweroutlet_disconnect.html

Initial push to public repo

2016-03-01 11:23:03 -05:00

powerport_connect.html

Fixes #1229: Fix validation error on forms where API search is used

2017-05-25 14:33:50 -04:00

powerport_delete.html

Initial push to public repo

2016-03-01 11:23:03 -05:00

powerport_disconnect.html

Initial push to public repo

2016-03-01 11:23:03 -05:00

rack_bulk_edit.html

Added headers to all bulk edit tables

2016-09-28 17:20:16 -04:00

rack_edit.html

Added tenant_group/tenant form section to all objects with tenancy

2017-05-11 17:35:20 -04:00

rack_elevation_list.html

Fixes #1236: Truncate rack names in elevations list; add facility ID

2017-05-30 13:13:01 -04:00

rack_list.html

Closes #841: Merged search and filter forms on all object lists

2017-01-24 12:05:39 -05:00

rack.html

Fixes #1187: Fixed table pagination by introducing a custom table template

2017-05-16 16:19:55 -04:00

rackgroup_list.html

Closes #841: Merged search and filter forms on all object lists

2017-01-24 12:05:39 -05:00

rackreservation_list.html

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

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

rackrole_list.html

Closes #241: Introduced rack roles

2016-08-10 11:52:27 -04:00

region_list.html

Merged develop

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

site_bulk_edit.html

Added headers to all bulk edit tables

2016-09-28 17:20:16 -04:00

site_edit.html

Added tenant_group/tenant form section to all objects with tenancy

2017-05-11 17:35:20 -04:00

site_list.html

Closes #841: Merged search and filter forms on all object lists

2017-01-24 12:05:39 -05:00

site.html

Fixes #1187: Fixed table pagination by introducing a custom table template

2017-05-16 16:19:55 -04:00