Jeremy Stretch b71566f206 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

2017-02-16 14:28:06 -05:00

..

templatetags

Rack reservations (#900)

2017-02-16 13:46:58 -05:00

__init__.py

Initial push to public repo

2016-03-01 11:23:03 -05:00

api.py

Introduced ChoiceFieldSerializer for choice fields

2017-02-09 15:50:25 -05:00

context_processors.py

Initial push to public repo

2016-03-01 11:23:03 -05:00

error_handlers.py

Fixes #865: Fix server error when attempting to delete a protected object parent (Python 3)

2017-02-01 12:09:59 -05:00

fields.py

Fixes #672: Expanded color selection for rack and device roles

2016-12-06 12:28:29 -05:00

filters.py

Introduced NullableModelMultipleChoiceField to allow null filtering without causing introspection issues during database migrations

2016-09-20 15:48:58 -04:00

forms.py

Rack reservations (#900)

2017-02-16 13:46:58 -05:00

managers.py

Fixes #747: Fixes natural_order_by integer cast error on large numbers

2016-12-19 11:01:44 -05:00

middleware.py

Updated middleware for Django 1.10

2016-12-26 10:48:15 -05:00

models.py

Extended primary models to include 'created' and 'last_updated' fields

2016-06-22 10:19:00 -04:00

paginator.py

Simplified paginator when dealing with <=5 pages

2016-12-26 15:43:48 -05:00

sql.py

Fixes #531: Order prefixes by VRF assignment

2016-09-15 12:09:54 -04:00

tables.py

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

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

utils.py

Fixes #851: Resolve encoding issues during import/export with Python 3

2017-02-01 11:49:54 -05:00

views.py

Exposed the request to ObjectEditView's alter_obj()

2017-02-15 15:03:31 -05:00