Jeremy Stretch 04aedcc056 Merge branch 'develop' into api2 ...

Conflicts:
	netbox/templates/users/_user.html
	netbox/users/urls.py

2017-03-14 12:40:28 -04:00

..

inc

Merge branch 'develop' into api2

2017-02-27 17:04:08 -05:00

console_connections_import.html

…

console_connections_list.html

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

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

consoleport_connect.html

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

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

consoleport_delete.html

…

consoleport_disconnect.html

…

consoleserverport_connect.html

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

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

consoleserverport_delete.html

…

consoleserverport_disconnect.html

…

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

Closes #49: Introduction of circuit terminations

2016-12-14 13:47:22 -05:00

device_import_child.html

Standardized naming of return_url for all object views

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

device_import.html

Standardized naming of return_url for all object views

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

device_inventory.html

Standardized the use of return_url for ObjectDeleteView

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

device_list.html

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

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

device_lldp_neighbors.html

Standardized template names

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

device.html

Fix parent device position display

2017-03-13 11:25:06 -04:00

devicebay_delete.html

…

devicebay_depopulate.html

…

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

Closes #284: Added interface_ordering field to DeviceType

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

interface_bulk_edit.html

#353: Allow bulk editing of interfaces

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

interface_connections_import.html

…

interface_connections_list.html

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

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

interface_delete.html

…

interfaceconnection_delete.html

…

interfaceconnection_edit.html

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

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

interfacetemplate_bulk_edit.html

#353: Added bulk editing for InterfaceTemplates

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

ipaddress_assign.html

Standardized naming of return_url for all object views

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

manufacturer_list.html

Replaced most glyphicons with Font Awesome

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

module_delete.html

…

platform_list.html

Replaced most glyphicons with Font Awesome

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

power_connections_import.html

…

power_connections_list.html

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

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

poweroutlet_connect.html

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

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

poweroutlet_delete.html

…

poweroutlet_disconnect.html

…

powerport_connect.html

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

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

powerport_delete.html

…

powerport_disconnect.html

…

rack_bulk_edit.html

Added headers to all bulk edit tables

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

rack_edit.html

Closes #191: Support for racks numbered top-to-bottom

2016-10-28 11:30:40 -04:00

rack_import.html

Standardized naming of return_url for all object views

2017-01-23 14:07:26 -05: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

Merged develop

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

rackgroup_list.html

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

2017-01-24 12:05:39 -05: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

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

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

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

site.html

Merged develop

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