Jeremy Stretch 9b39ba169c 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
	netbox/dcim/tables.py
	requirements.txt

2017-03-02 16:01:25 -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

Additional work on #904

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

tests

Follow-up to #804

2017-01-17 12:32:54 -05:00

__init__.py

…

admin.py

Closes #695: Added is_private field to RIR

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

apps.py

…

fields.py

Closes #901: Support for filtering prefixes and IP addresses by mask length

2017-03-01 14:23:52 -05:00

filters.py

Closes #901: Support for filtering prefixes and IP addresses by mask length

2017-03-01 14:23:52 -05:00

formfields.py

…

forms.py

Closes #901: Support for filtering prefixes and IP addresses by mask length

2017-03-01 14:23:52 -05:00

lookups.py

Closes #901: Support for filtering prefixes and IP addresses by mask length

2017-03-01 14:23:52 -05:00

models.py

Additional work on #904

2017-02-21 14:53:22 -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

Merged develop

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