Jeremy Stretch 68c099a2af Merge branch 'develop' into api2 ...

Conflicts:
	netbox/netbox/settings.py

2017-03-08 15:18:32 -05:00

..

circuits

Merge branch 'develop' into api2

2017-03-07 14:08:06 -05:00

dcim

Merged develop

2017-02-28 16:10:53 -05:00

inc

Closes #841: Merged search and filter forms on all object lists

2017-01-24 12:05:39 -05:00

ipam

Merged develop

2017-02-28 16:10:53 -05:00

secrets

Adapted the web UI to work with the new secrets API

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

tenancy

Closes #841: Merged search and filter forms on all object lists

2017-01-24 12:05:39 -05:00

users

Finished user control panel for tokens

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

utilities

Fixes #845: Fix missing edit/delete buttons on object tables for non-superusers

2017-01-26 13:20:56 -05:00

_base.html

Closes #945: Display the current user in the nav menu

2017-03-07 22:27:46 -05:00

404.html

Closes #630: Added a custom 404 page

2016-10-24 13:53:58 -04:00

500.html

#212: Introduced BASE_PATH configuration setting

2016-09-29 16:32:16 -04:00

home.html

Widened page layout; improved mobile rendering

2016-12-09 16:23:11 -05:00

import_success.html

Partial conversion from glyphicons to font awesome

2016-07-29 18:04:38 -04:00

login.html

Update login.html

2016-07-08 20:43:58 -04:00

paginator.html

Fixed paginator text rendering

2016-12-26 15:36:33 -05:00

panel_table.html

Initial push to public repo

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

table.html

Initial push to public repo

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