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

…

aggregate_bulk_edit.html

…

aggregate_edit.html

…

aggregate_import.html

…

aggregate_list.html

…

aggregate.html

…

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

…

ipaddress_edit.html

Merge branch 'develop' into v2-develop

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

ipaddress_import.html

…

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

…

ipaddress.html

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

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

prefix_bulk_edit.html

…

prefix_delete.html

…

prefix_edit.html

…

prefix_import.html

…

prefix_ipaddresses.html

…

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

…

role_list.html

…

service_edit.html

…

vlan_bulk_edit.html

…

vlan_edit.html

…

vlan_import.html

…

vlan_list.html

…

vlan.html

Merged develop

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

vlangroup_list.html

…

vrf_bulk_edit.html

…

vrf_edit.html

…

vrf_import.html

…

vrf_list.html

…

vrf.html

…