Jeremy Stretch 5b43a108bc Merge branch 'develop' into develop-2.1 ... Conflicts: netbox/ipam/models.py netbox/netbox/settings.py netbox/templates/dcim/inc/interface.html		2017-07-06 13:27:13 -04:00
..
circuits	Converted circuits import views to new scheme	2017-06-02 13:40:52 -04:00
dcim	Merge branch 'develop' into develop-2.1	2017-07-06 13:27:13 -04:00
inc	Fixes #1213: Corrected table header ordering links	2017-05-23 22:15:13 -04:00
ipam	Closes #819: Implemented IP address functional roles	2017-06-14 16:11:13 -04:00
secrets	Fixes #1187: Fixed table pagination by introducing a custom table template	2017-05-16 16:19:55 -04:00
tenancy	Converted circuits import views to new scheme	2017-06-02 13:40:52 -04:00
users	Include instructions when displaying an inactive user key	2017-07-05 10:51:25 -04:00
utilities	Layout tweaks	2017-06-07 15:54:48 -04:00
_base.html	Fixes #1157: Hide nav menu search bar on small displays	2017-05-17 16:00:46 -04:00
404.html	Closes #630: Added a custom 404 page	2016-10-24 13:53:58 -04:00
500.html	Cleaned up 500 error template	2017-05-19 16:03:04 -04:00
home.html	Fixes #1187: Fixed table pagination by introducing a custom table template	2017-05-16 16:19:55 -04:00
import_success.html	Fixes #1187: Fixed table pagination by introducing a custom table template	2017-05-16 16:19:55 -04:00
login.html	Update login.html	2016-07-08 20:43:58 -04:00
panel_table.html	Restored the option to hide the paginator on panel tables	2017-05-17 12:18:32 -04:00
responsive_table.html	Fixes #1187: Fixed table pagination by introducing a custom table template	2017-05-16 16:19:55 -04:00
search_form.html	Search form improvements	2017-03-29 14:22:27 -04:00
search.html	Prettied things up a bit	2017-03-29 16:45:25 -04:00