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

migrations

Closes #412: Tenant group assignment is no longer mandatory

2016-08-02 16:04:25 -04:00

__init__.py

Initial multitenancy implementation

2016-07-26 14:58:37 -04:00

admin.py

Added stats to tenant view

2016-07-27 11:56:47 -04:00

apps.py

Initial multitenancy implementation

2016-07-26 14:58:37 -04:00

filters.py

Closes #927: Upgrade to django-filter 1.0

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

forms.py

Closes #927: Upgrade to django-filter 1.0

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

models.py

Basic Support for Python 3 (#827)

2017-01-23 16:44:29 -05:00

tables.py

Fixed actions column alignment

2016-07-29 10:57:09 -04:00

urls.py

Initial multitenancy implementation

2016-07-26 14:58:37 -04:00

views.py

Fixes #845: Fix missing edit/delete buttons on object tables for non-superusers

2017-01-26 13:20:56 -05:00