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

Conflicts:
	netbox/circuits/models.py
	netbox/netbox/settings.py
	upgrade.sh

2017-04-21 15:07:48 -04:00

..

inc

Closes #181: Implemented support for bulk IP address creation

2016-12-20 15:39:22 -05:00

aggregate_bulk_edit.html

Added headers to all bulk edit tables

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

aggregate_edit.html

Added templates for IPAM objects; cleaned up admin

2016-08-15 16:58:25 -04:00

aggregate_import.html

Standardized naming of return_url for all object views

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

aggregate_list.html

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

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

aggregate.html

Cleaned up attribute tables

2016-12-14 17:09:33 -05:00

ipaddress_assign.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

ipaddress_bulk_add.html

Closes #1084: Include custom fields when creating IP addresses in bulk

2017-04-19 14:50:58 -04:00

ipaddress_bulk_edit.html

Closes #87: Added status field to IP addresses

2016-10-21 12:34:02 -04:00

ipaddress_edit.html

Merge branch 'develop' into v2-develop

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

ipaddress_import.html

Standardized naming of return_url for all object views

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

ipaddress_list.html

Fixes #845: Fix missing edit/delete buttons on object tables for non-superusers

2017-01-26 13:20:56 -05:00

ipaddress_unassign.html

Closes #211: Allow device assignment and removal from IP address view

2016-10-24 15:07:11 -04:00

ipaddress.html

Closes #1001: Merged IP interface assignment into ipam.IPAddressForm

2017-04-13 14:54:17 -04:00

prefix_bulk_edit.html

Added headers to all bulk edit tables

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

prefix_delete.html

Closes #803: Clarify that no child objects are deleted when deleting a prefix

2017-01-17 14:52:39 -05:00

prefix_edit.html

Fixes #658: Added is_pool field to Prefix model

2016-12-27 15:07:52 -05:00

prefix_import.html

Standardized naming of return_url for all object views

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

prefix_ipaddresses.html

Introduced consolidated object table template

2016-05-16 16:15:37 -04:00

prefix_list.html

Closes #951: Provide a side-by-side view of rack elevations

2017-04-20 13:07:22 -04:00

prefix.html

Merged develop

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

rir_list.html

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

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

role_list.html

Replaced most glyphicons with Font Awesome

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

service_edit.html

Closes #539: Implemented L4 services for devices

2016-12-15 15:32:58 -05:00

vlan_bulk_edit.html

Added headers to all bulk edit tables

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

vlan_edit.html

Added templates for IPAM objects; cleaned up admin

2016-08-15 16:58:25 -04:00

vlan_import.html

Standardized naming of return_url for all object views

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

vlan_list.html

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

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

vlan.html

Merged develop

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

vlangroup_list.html

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

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

vrf_bulk_edit.html

Added headers to all bulk edit tables

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

vrf_edit.html

Added templates for IPAM objects; cleaned up admin

2016-08-15 16:58:25 -04:00

vrf_import.html

Standardized naming of return_url for all object views

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

vrf_list.html

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

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

vrf.html

Cleaned up attribute tables

2016-12-14 17:09:33 -05:00