Jeremy Stretch b71566f206 Merge branch 'develop' into api2 ...

Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/urls.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py

2017-02-16 14:28:06 -05:00

..

api

Re-implemented CustomFieldSerializer (read-only for now)

2017-02-09 16:55:54 -05:00

fixtures

Closes #695: Added is_private field to RIR

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

migrations

Closes #836: Add 'deprecated' status for IP addresses

2017-01-23 14:12:43 -05:00

tests

Follow-up to #804

2017-01-17 12:32:54 -05: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

Fixes #199: Moved prefix_validator from BaseIPField to IPNetworkField

2016-07-05 16:39:43 -04:00

filters.py

Allow null filtering of prefix VLAN

2017-01-03 16:57:42 -05:00

formfields.py

Initial push to public repo

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

forms.py

Closes #841: Merged search and filter forms on all object lists

2017-01-24 12:05:39 -05:00

lookups.py

Initial push to public repo

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

models.py

Basic Support for Python 3 (#827)

2017-01-23 16:44:29 -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

Exposed the request to ObjectEditView's alter_obj()

2017-02-15 15:03:31 -05:00