checktheroads 4c3b0abe7b Merge branch 'feature' of https://github.com/netbox-community/netbox into feature ... # Conflicts: # netbox/dcim/tables/template_code.py # netbox/netbox/views/__init__.py # netbox/project-static/css/base.css # netbox/templates/base.html # netbox/templates/circuits/circuit.html # netbox/templates/circuits/circuittermination_edit.html # netbox/templates/circuits/inc/circuit_termination.html # netbox/templates/circuits/provider.html # netbox/templates/dcim/device.html # netbox/templates/dcim/device/base.html # netbox/templates/dcim/device_component.html # netbox/templates/dcim/devicetype.html # netbox/templates/dcim/inc/device_napalm_tabs.html # netbox/templates/dcim/rack.html # netbox/templates/dcim/site.html # netbox/templates/dcim/virtualchassis.html # netbox/templates/extras/configcontext.html # netbox/templates/extras/object_journal.html # netbox/templates/extras/tag.html # netbox/templates/generic/object.html # netbox/templates/generic/object_list.html # netbox/templates/home.html # netbox/templates/inc/nav_menu.html # netbox/templates/ipam/aggregate.html # netbox/templates/ipam/ipaddress.html # netbox/templates/ipam/prefix.html # netbox/templates/ipam/vlan.html # netbox/templates/ipam/vlangroup_edit.html # netbox/templates/ipam/vlangroup_vlans.html # netbox/templates/secrets/secret.html # netbox/templates/tenancy/tenant.html # netbox/templates/users/api_tokens.html # netbox/templates/virtualization/cluster.html # netbox/templates/virtualization/vminterface_edit.html # netbox/utilities/forms/fields.py # netbox/utilities/templates/buttons/export.html		2021-04-14 11:30:15 -07:00
..
api	Add 'display' field to all REST API serializers	2021-03-16 10:06:25 -04:00
migrations	Closes #5370: Extend custom field support to organizational models	2021-02-26 16:25:37 -05:00
templates	Initial push to public repo	2016-03-01 11:23:03 -05:00
tests	Add 'display' field to all REST API serializers	2021-03-16 10:06:25 -04:00
__init__.py	Temporary hack to avoid name collision without renaming the secrets app	2020-02-18 18:00:00 -05:00
admin.py	Fixes #4968: Fix exception when activating user keys in admin UI	2020-08-07 12:06:53 -04:00
apps.py	Removed Python 2 string compatibility	2018-08-14 11:58:42 -04:00
constants.py	Update secrets API, views	2020-09-18 16:58:51 -04:00
exceptions.py	Miscellaneous cleanup	2019-10-04 12:59:10 -04:00
filters.py	Rename CustomFieldFilterSet	2020-11-23 14:47:54 -05:00
forms.py	Drop usage of display_field on DynamicModelChoiceFields	2021-03-16 10:29:15 -04:00
hashers.py	Removed Python 2 string compatibility	2018-08-14 11:58:42 -04:00
models.py	Add dedicated views for organizational models	2021-03-26 14:44:43 -04:00
querysets.py	Removed Python 2 string compatibility	2018-08-14 11:58:42 -04:00
tables.py	LinkedCountColumn should always invoke filter by ID	2021-04-05 11:47:25 -04:00
urls.py	Add dedicated views for organizational models	2021-03-26 14:44:43 -04:00
utils.py	Move utility functions for secrets to secrets/utils.py	2020-01-14 12:13:58 -05:00
views.py	Merge branch 'feature' of https://github.com/netbox-community/netbox into feature	2021-04-14 11:30:15 -07:00