mirror of
https://github.com/netbox-community/netbox.git
synced 2025-12-15 12:59:35 -06:00
Merge branch 'feature' into 20210-new-token-auth
This commit is contained in:
commit
9a68cde95f
8
.github/codeql/codeql-config.yml
vendored
8
.github/codeql/codeql-config.yml
vendored
@ -1,3 +1,11 @@
|
|||||||
paths-ignore:
|
paths-ignore:
|
||||||
# Ignore compiled JS
|
# Ignore compiled JS
|
||||||
- netbox/project-static/dist
|
- netbox/project-static/dist
|
||||||
|
|
||||||
|
query-filters:
|
||||||
|
# Exclude py/url-redirection: NetBox uses safe_for_redirect() wrapper function
|
||||||
|
# which validates all redirects via Django's url_has_allowed_host_and_scheme().
|
||||||
|
# CodeQL's taint tracking doesn't recognize wrapper functions without custom
|
||||||
|
# query configuration. See #20484.
|
||||||
|
- exclude:
|
||||||
|
id: py/url-redirection
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
import datetime
|
import datetime
|
||||||
import importlib
|
import importlib
|
||||||
import importlib.util
|
|
||||||
from dataclasses import dataclass, field
|
from dataclasses import dataclass, field
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
|
|||||||
@ -3,9 +3,7 @@ import django.db.models.deletion
|
|||||||
import taggit.managers
|
import taggit.managers
|
||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
|
|
||||||
import utilities.fields
|
|
||||||
import utilities.json
|
import utilities.json
|
||||||
import utilities.ordering
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|||||||
@ -548,7 +548,7 @@ class IPRange(ContactsMixin, PrimaryModel):
|
|||||||
mark_utilized = models.BooleanField(
|
mark_utilized = models.BooleanField(
|
||||||
verbose_name=_('mark utilized'),
|
verbose_name=_('mark utilized'),
|
||||||
default=False,
|
default=False,
|
||||||
help_text=_("Report space as 100% utilized")
|
help_text=_("Report space as fully utilized")
|
||||||
)
|
)
|
||||||
|
|
||||||
clone_fields = (
|
clone_fields = (
|
||||||
|
|||||||
@ -8,7 +8,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2025-10-01 05:02+0000\n"
|
"POT-Creation-Date: 2025-10-02 05:01+0000\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
@ -10919,8 +10919,7 @@ msgid "Prevent the creation of IP addresses within this range"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: netbox/ipam/models/ip.py:551
|
#: netbox/ipam/models/ip.py:551
|
||||||
#, python-format
|
msgid "Report space as fully utilized"
|
||||||
msgid "Report space as 100% utilized"
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: netbox/ipam/models/ip.py:560
|
#: netbox/ipam/models/ip.py:560
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user