netbox/netbox/dcim
Jeremy Stretch 409c9c4e23 Merge branch 'develop' into v2-develop
Conflicts:
	netbox/netbox/settings.py
2017-04-04 12:06:49 -04:00
..
api Fixes #1025: Applied missing API view filters 2017-04-03 11:04:17 -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 Renamed Module to InventoryItem (prep for #824) 2017-03-21 12:54:08 -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 #1025: Applied missing API view filters 2017-04-03 11:04:17 -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-04 12:06:49 -04:00
models.py Added image attachments to sites and devices 2017-03-31 15:19:44 -04:00
tables.py Introduced SearchTable for improved performance 2017-03-29 16:05:23 -04:00
urls.py Added image attachments to sites and devices 2017-03-31 15:19:44 -04:00
views.py Merge branch 'develop' into v2-develop 2017-04-04 12:06:49 -04:00