Jeremy Stretch 57fc6a3f50 Merge branch 'develop' into v2-develop ... Conflicts: netbox/netbox/settings.py netbox/netbox/urls.py requirements.txt		2017-04-06 17:01:13 -04:00
..
api	Rearranged URL namespaces to satisfy deprecation warnings	2017-04-05 14:26:33 -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
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	Merge branch 'develop' into v2-develop	2017-04-06 17:01:13 -04: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	Resolved RemovedInDjango20Warning deprecation warnings	2017-04-05 14:40:25 -04:00
tables.py	Introduced SearchTable for improved performance	2017-03-29 16:05:23 -04:00
urls.py	Rearranged URL namespaces to satisfy deprecation warnings	2017-04-05 14:26:33 -04:00
views.py	Resolved RemovedInDjango20Warning deprecation warnings	2017-04-05 14:40:25 -04:00