Jeremy Stretch 732827f689 Merge branch 'develop' into develop-2.2 ...

Conflicts:
	netbox/utilities/api.py

2017-10-11 10:47:21 -04:00

..

inc

Merge branch 'develop' into develop-2.2

2017-10-11 10:47:21 -04:00

aggregate_edit.html

Added templates for IPAM objects; cleaned up admin

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

aggregate_list.html

Closes #1536: Improved formatting of aggregate prefix statistics

2017-09-25 12:14:55 -04:00

aggregate.html

Cleaned up title blocks

2017-08-02 13:15:28 -04:00

ipaddress_bulk_add.html

Renamed form_class attribute to model_form for consistency

2017-09-12 13:55:11 -04:00

ipaddress_edit.html

Allowed assigning an IP address to either a device or a VM

2017-08-29 15:26:35 -04:00

ipaddress_list.html

Cleaned up title blocks

2017-08-02 13:15:28 -04:00

ipaddress.html

Merge branch 'develop' into virtualization

2017-08-31 10:14:50 -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

Closes #704: Allow filtering VLANs by group when editing prefixes

2017-06-09 14:15:12 -04:00

prefix_ipaddresses.html

Cleaned up title blocks

2017-08-02 13:15:28 -04:00

prefix_list.html

Cleaned up title blocks

2017-08-02 13:15:28 -04:00

prefix.html

Added utilization percetange to aggregate and prefix views

2017-06-08 12:48:49 -04:00

rir_list.html

Cleaned up title blocks

2017-08-02 13:15:28 -04:00

role_list.html

Fixes #1458: Corrected permission name on prefix/VLAN roles list

2017-08-29 15:36:51 -04:00

service_edit.html

Enabled services on virtual machines

2017-08-31 12:50:35 -04:00

vlan_edit.html

Fixes #1186: Corrected VLAN edit form so that site assignment is not required

2017-05-16 16:30:28 -04:00

vlan_list.html

Cleaned up title blocks

2017-08-02 13:15:28 -04:00

vlan.html

Cleaned up title blocks

2017-08-02 13:15:28 -04:00

vlangroup_list.html

Cleaned up title blocks

2017-08-02 13:15:28 -04:00

vrf_edit.html

Added tenant_group/tenant form section to all objects with tenancy

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

vrf_list.html

Cleaned up title blocks

2017-08-02 13:15:28 -04:00

vrf.html

Cleaned up title blocks

2017-08-02 13:15:28 -04:00