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

Corrected region serializers

2017-02-28 16:23:39 -05:00

fixtures

Closes #198: Support for rackless devices (#902)

2017-02-17 14:48:00 -05:00

migrations

Closes #894: Expand device name max length to 64 characters

2017-03-02 10:11:54 -05:00

tests

Merged develop

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

__init__.py

Renamed IPAMConfig to DCIMConfig

2016-07-13 09:25:13 -04:00

admin.py

Merged develop

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

apps.py

Renamed IPAMConfig to DCIMConfig

2016-07-13 09:25:13 -04:00

fields.py

Fixes #268: Added support for full 32-bit ASN space

2016-07-13 15:30:15 -04:00

filters.py

Merge branch 'develop' into api2

2017-03-02 16:01:25 -05:00

formfields.py

Force 48-bit MAC format for proper error messages during validation

2016-07-06 14:22:34 -04:00

forms.py

Closes #927: Upgrade to django-filter 1.0

2017-03-01 13:09:19 -05:00

models.py

Closes #894: Expand device name max length to 64 characters

2017-03-02 10:11:54 -05:00

tables.py

Closes #862: Show both IPv6 and IPv4 primary IPs in device list

2017-02-28 16:46:44 -05:00

urls.py

Merged develop

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

views.py

Merged develop

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