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

Conflicts:
	netbox/netbox/settings.py

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

..

api

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

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

fixtures

Closes #176: Added initial_data fixtures for new installs

2016-08-01 12:29:26 -04:00

migrations

Created migrations for transition to Unicode literals

2017-05-24 14:18:52 -04:00

templates

Initial push to public repo

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

templatetags

Import unicode_literals

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

tests

Import unicode_literals

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

__init__.py

Initial push to public repo

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

admin.py

Fixes #1312: Catch error when attempting to activate a user key with an invalid private key

2017-07-12 10:06:13 -04:00

apps.py

Initial push to public repo

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

decorators.py

Import unicode_literals

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

exceptions.py

Import unicode_literals

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

filters.py

Closes #1203: Implemented query filters for all models

2017-06-19 16:10:18 -04:00

forms.py

Fixes #1342: Allow designation of users and groups when creating/editing a secret role

2017-07-13 11:44:29 -04:00

hashers.py

Import unicode_literals

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

models.py

Closes #913: Added headers to object CSV exports

2017-06-09 16:24:59 -04:00

tables.py

Removed SearchTables; created DetailTables for models where needed

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

urls.py

Fixes #1263: Differentiate add and edit permissions for objects

2017-06-13 16:41:57 -04:00

views.py

Optimized performance when editing/deleting objects in bulk

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