checktheroads eb55761c38 Merge branch 'feature' of https://github.com/netbox-community/netbox into feature ...

# Conflicts:
#	netbox/project-static/js/forms.js
#	netbox/templates/dcim/location.html
#	netbox/templates/generic/object_list.html

2021-04-22 19:19:03 -07:00

..

forms

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

2021-04-22 19:19:03 -07:00

management

…

templates

remove all bootstrap icons in favor of material design icons

2021-04-21 11:31:28 -07:00

templatetags

add provider networks to navigation

2021-04-18 00:23:06 -07:00

testing

Reorganize base TestCase classes

2021-04-14 14:22:58 -04:00

tests

Merge branch 'develop' into develop-2.10

2020-11-09 20:58:59 -05:00

__init__.py

…

api.py

Move rest_api_server_error() to utilities.api

2020-11-10 17:19:14 -05:00

background_tasks.py

…

choices.py

update css classes for bootstrap 5 colors

2021-03-17 23:31:15 -07:00

constants.py

…

custom_inspectors.py

Corrects error with ListSerializer as request_body

2021-01-26 14:03:46 -06:00

error_handlers.py

…

exceptions.py

…

fields.py

…

filters.py

Merge branch 'develop' into develop-2.10

2020-11-09 20:58:59 -05:00

mptt.py

…

ordering.py

…

paginator.py

…

permissions.py

…

query_functions.py

Upgrade Django to 3.2b1

2021-02-24 19:00:14 -05:00

querysets.py

…

tables.py

fix checkbox styles

2021-04-22 18:57:43 -07:00

utils.py

Merge branch 'develop' into feature

2021-04-11 13:16:00 -04:00

validators.py

Closes #609: Add min/max value and regex validation for custom fields

2020-10-15 15:06:01 -04:00

views.py

Closes #6097: Redirect old slug-based object views

2021-04-08 13:25:29 -04:00