Jeremy Stretch f73693206f Merge branch 'develop' into v2-develop ...

Conflicts:
	netbox/circuits/models.py
	netbox/netbox/settings.py
	upgrade.sh

2017-04-21 15:07:48 -04:00

..

circuits

Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade

2017-03-30 15:40:00 -04:00

dcim

Closes #951: Provide a side-by-side view of rack elevations

2017-04-20 13:07:22 -04:00

inc

Added image attachments to sites and devices

2017-03-31 15:19:44 -04:00

ipam

Merge branch 'develop' into v2-develop

2017-04-21 15:07:48 -04:00

secrets

Fixes #1049: Prompt user if missing session key when adding/editing a secret

2017-04-06 13:55:40 -04:00

tenancy

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

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

users

Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade

2017-03-30 15:40:00 -04:00

utilities

Merge branch 'develop' into v2-develop

2017-04-13 15:42:50 -04:00

_base.html

Closes #951: Provide a side-by-side view of rack elevations

2017-04-20 13:07:22 -04: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

Closes #578: Show topology maps not assigned to a site on the home view

2017-04-05 17:33:39 -04: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

Closes #951: Provide a side-by-side view of rack elevations

2017-04-20 13:07:22 -04:00

panel_table.html

Closes #951: Provide a side-by-side view of rack elevations

2017-04-20 13:07:22 -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

table_paginator.html

Closes #951: Provide a side-by-side view of rack elevations

2017-04-20 13:07:22 -04:00

table.html

Closes #951: Provide a side-by-side view of rack elevations

2017-04-20 13:07:22 -04:00