Jeremy Stretch 007f930fed Merge branch 'develop' into develop-2.2 ...

Conflicts:
	netbox/utilities/api.py

2017-10-11 10:47:21 -04:00

..

templates

#1033: Tweak SelectWithDisabled option template

2017-04-04 14:36:35 -04:00

templatetags

Merge branch 'develop' into virtualization

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

__init__.py

…

api.py

Merge branch 'develop' into develop-2.2

2017-10-11 10:47:21 -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

Closes #893: Allow filtering by null values for NullCharacterFields (e.g. return only unnamed devices)

2017-07-27 09:53:41 -04:00

forms.py

Merge branch 'develop' into virtualization

2017-08-31 10:14:50 -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

Added style to BaseTable's empty_text

2017-08-21 17:38:27 -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

validators.py

Closes #1460: Hostnames with no domain are now acceptable in custom URL fields

2017-08-30 14:08:39 -04:00

views.py

Fixes #1567: Prompt user for session key when importing secrets

2017-10-10 13:22:40 -04:00