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

Conflicts:
	netbox/circuits/filters.py

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

..

templatetags

…

__init__.py

…

api.py

Converted ChoiceFieldSerializer to display an object

2017-03-20 16:32:59 -04:00

context_processors.py

…

error_handlers.py

…

fields.py

…

filters.py

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

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

forms.py

Fixes #963: Fix bug in IPv6 address range expansion

2017-03-14 15:06:34 -04:00

managers.py

…

middleware.py

Include the API version in responses

2017-03-21 13:23:56 -04:00

models.py

…

paginator.py

…

sql.py

…

tables.py

…

tests.py

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

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

utils.py

…

views.py

Fixes #964: Fix bug when bulk editing/deleting filtered set of objects

2017-03-14 15:22:08 -04:00