Jeremy Stretch e8dafc02f7 Merge branch 'develop' into develop-2.1 ...

Conflicts:
	netbox/netbox/settings.py

2017-07-14 10:12:35 -04:00

..

templates

…

templatetags

Replaced all CSVForm ChoiceFields with CSVChoiceField

2017-06-07 13:22:06 -04:00

__init__.py

…

api.py

Fixes #1285: Enforce model validation when creating/editing objects via the API

2017-07-06 17:37:24 -04:00

context_processors.py

Import unicode_literals

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

error_handlers.py

Import unicode_literals

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

fields.py

Import unicode_literals

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

filters.py

Import unicode_literals

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

forms.py

Closes #1320: Remove checkbox from confirmation dialog

2017-07-12 14:53:52 -04:00

managers.py

Import unicode_literals

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

middleware.py

Import unicode_literals

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

models.py

Import unicode_literals

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

paginator.py

Import unicode_literals

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

sql.py

Import unicode_literals

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

tables.py

Removed SearchTables; created DetailTables for models where needed

2017-07-12 16:42:45 -04:00

tests.py

PEP8 fix

2017-05-24 14:22:37 -04:00

utils.py

Import unicode_literals

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

views.py

Merge branch 'develop' into develop-2.1

2017-07-14 10:12:35 -04:00