Jeremy Stretch 04aedcc056 Merge branch 'develop' into api2 ...

Conflicts:
	netbox/templates/users/_user.html
	netbox/users/urls.py

2017-03-14 12:40:28 -04:00

..

api

Closes #855: Added an API endpoint for recent activity

2017-03-09 14:26:39 -05:00

migrations

Finished user control panel for tokens

2017-03-08 11:34:47 -05:00

__init__.py

Initial push to public repo

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

admin.py

Initial work on token authentication

2017-03-07 17:17:39 -05:00

forms.py

Finished user control panel for tokens

2017-03-08 11:34:47 -05:00

models.py

Finished user control panel for tokens

2017-03-08 11:34:47 -05:00

urls.py

Merge branch 'develop' into api2

2017-03-14 12:40:28 -04:00

views.py

Merge branch 'develop' into api2

2017-03-14 12:40:28 -04:00