Jeremy Stretch 3466da4338 Merge branch 'develop' into develop-2.2 ...

Conflicts:
	netbox/dcim/forms.py

2017-09-14 14:58:45 -04:00

..

api

Reworked relationship between devices and clusters

2017-08-16 17:21:34 -04:00

fixtures

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

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

migrations

Regenerated migrations

2017-08-31 10:17:59 -04:00

tests

Import unicode_literals

2017-05-24 11:33:11 -04:00

__init__.py

Renamed IPAMConfig to DCIMConfig

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

apps.py

Import unicode_literals

2017-05-24 11:33:11 -04:00

constants.py

Merge branch 'develop' into virtualization

2017-08-31 10:14:50 -04:00

fields.py

Import unicode_literals

2017-05-24 11:33:11 -04:00

filters.py

Merge branch 'develop' into virtualization

2017-08-31 10:14:50 -04:00

formfields.py

Import unicode_literals

2017-05-24 11:33:11 -04:00

forms.py

Merge branch 'develop' into develop-2.2

2017-09-14 14:58:45 -04:00

models.py

Merge branch 'develop' into develop-2.2

2017-09-14 14:58:45 -04:00

tables.py

Optimized performance when editing/deleting objects in bulk

2017-07-13 17:39:28 -04:00

urls.py

Enabled services on virtual machines

2017-08-31 12:50:35 -04:00

views.py

Renamed form_class attribute to model_form for consistency

2017-09-12 13:55:11 -04:00