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

Conflicts:
	netbox/circuits/filters.py

2017-03-22 09:48:41 -04:00

..

api

Fixed browsable API breadcrumbs

2017-03-20 21:50:10 -04:00

fixtures

Closes #695: Added is_private field to RIR

2016-12-06 13:59:13 -05:00

migrations

Additional work on #904

2017-02-21 14:53:22 -05:00

tests

Introduced HttpStatusMixin to provide more detail on HTTP response status test failures

2017-03-20 13:46:47 -04:00

__init__.py

PEP8 clenaup

2016-06-16 15:02:01 -04:00

admin.py

Closes #695: Added is_private field to RIR

2016-12-06 13:59:13 -05:00

apps.py

Initial push to public repo

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

fields.py

Closes #946: Disregard mask length when filtering IP addresses by a parent prefix

2017-03-08 11:59:24 -05:00

filters.py

Closes #981: Allow filtering primary objects by a given set of IDs

2017-03-22 09:39:30 -04:00

formfields.py

Initial push to public repo

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

forms.py

Fixes #941: Corrected old references to rack.site on Device

2017-03-06 10:23:24 -05:00

lookups.py

Closes #946: Disregard mask length when filtering IP addresses by a parent prefix

2017-03-08 11:59:24 -05:00

models.py

Fixes #943: Child prefixes missing on Python 3

2017-03-08 14:10:27 -05:00

tables.py

Closes #820: Add VLAN column to parent prefixes table on IP address view

2017-01-23 14:23:42 -05:00

urls.py

Closes #181: Implemented support for bulk IP address creation

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

views.py

Fixes #943: Child prefixes missing on Python 3

2017-03-08 14:10:27 -05:00