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

Implemented SessionKeys for secrets

2017-02-03 12:49:32 -05:00

fixtures

Closes #176: Added initial_data fixtures for new installs

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

migrations

Implemented SessionKeys for secrets

2017-02-03 12:49:32 -05:00

templates

…

templatetags

#68: Improved permissions-related error handling

2016-07-06 17:22:10 -04:00

tests

Implemented SessionKeys for secrets

2017-02-03 12:49:32 -05:00

__init__.py

…

admin.py

Cleaned up message strings

2016-10-31 11:16:30 -04:00

apps.py

…

decorators.py

Cleaned up message strings

2016-10-31 11:16:30 -04:00

filters.py

Merge branch 'develop' into api2

2017-03-02 16:01:25 -05:00

forms.py

Merge branch 'develop' into api2

2017-03-02 16:01:25 -05:00

hashers.py

…

models.py

Implemented SessionKeys for secrets

2017-02-03 12:49:32 -05:00

tables.py

Replaced edit links with buttons

2016-07-28 15:04:33 -04:00

urls.py

…

views.py

Adapted the web UI to work with the new secrets API

2017-02-03 16:14:42 -05:00