Jeremy Stretch b01bf6089c Merge branch 'develop' into v2-develop ...

Conflicts:
	netbox/dcim/forms.py
	netbox/dcim/views.py
	netbox/ipam/forms.py
	netbox/templates/_base.html
	netbox/utilities/views.py

2017-04-13 15:42:50 -04:00

..

api

Fixes #1059: Allow filtering of interface connections via API

2017-04-10 16:15:36 -04:00

fixtures

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

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

migrations

Renamed Module to InventoryItem (prep for #824)

2017-03-21 12:54:08 -04:00

tests

Added API endpoints for console and power connections

2017-04-05 11:29:12 -04:00

__init__.py

Renamed IPAMConfig to DCIMConfig

2016-07-13 09:25:13 -04: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

Fixes #1059: Allow filtering of interface connections via API

2017-04-10 16:15:36 -04:00

formfields.py

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

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

forms.py

Merge branch 'develop' into v2-develop

2017-04-13 15:42:50 -04:00

models.py

Merge branch 'develop' into v2-develop

2017-04-06 17:01:13 -04:00

tables.py

Merge branch 'develop' into v2-develop

2017-04-06 17:01:13 -04:00

urls.py

Merge branch 'develop' into v2-develop

2017-04-13 15:42:50 -04:00

views.py

Merge branch 'develop' into v2-develop

2017-04-13 15:42:50 -04:00