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

..

circuits

Merge branch 'develop' into api2

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

dcim

Merge branch 'develop' into api2

2017-03-14 12:40:28 -04: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

Secrets UI work

2017-03-14 12:32:08 -04:00

tenancy

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

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

users

Merge branch 'develop' into api2

2017-03-14 12:40:28 -04: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

Renamed user URL namespace

2017-03-14 12:36:44 -04:00

404.html

…

500.html

…

home.html

Widened page layout; improved mobile rendering

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

import_success.html

…

login.html

…

paginator.html

Fixed paginator text rendering

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

panel_table.html

…

table.html

…