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
checktheroads
d1d2ad6a5c
bootstrap 5 class updates
2021-04-13 21:51:12 -07:00
jeremystretch
e3f5062583
Merge branch 'develop' into feature
2021-04-13 16:41:46 -04:00
jeremystretch
1fba4b7e32
Fixes #5419 : Update parent device/VM when deleting a primary IP
2021-04-13 13:23:25 -04:00
jeremystretch
03b3f5937f
Fixes #6108 : Do not infer tenant assignment from parent objects for prefixes, IP addresses
2021-04-08 13:50:06 -04:00
jeremystretch
85359bb10f
Fix ContentType assignment
2021-04-05 14:05:28 -04:00
jeremystretch
f0018dcba9
LinkedCountColumn should always invoke filter by ID
2021-04-05 11:47:25 -04:00
jeremystretch
7949a5e1fd
Migrate VLANGroup site assignments
2021-04-05 11:40:46 -04:00
jeremystretch
779837389b
Convert all LinkColumns to Column(linkify=True)
2021-04-02 16:59:53 -04:00
Jeremy Stretch
6287f75e67
Toggle VLANGroup scope selector fields
2021-04-02 11:31:46 -04:00
Jeremy Stretch
d82f2e289a
Use ContentTypeChoiceField for all ContentType fields
2021-04-02 10:55:16 -04:00
Jeremy Stretch
73e9842877
Introduce ContentTypeChoiceField
2021-04-02 10:54:13 -04:00
Jeremy Stretch
a86178f19b
Simplify VLANGroup scope assignment (WIP)
2021-04-02 09:36:14 -04:00
Jeremy Stretch
9a5f54bdaf
Add tests for filtering VLANs by device/VM
2021-03-31 10:59:15 -04:00
Jeremy Stretch
d33d9522cc
Fix VM VLAN filtering
2021-03-30 21:46:56 -04:00
Jeremy Stretch
b91e5763e2
Add 'available_on' VLAN filters for devices & VMs
2021-03-30 21:32:48 -04:00
Jeremy Stretch
eac53a779b
Migrate prefix, VLAN templates to new structure
2021-03-29 16:43:29 -04:00
Jeremy Stretch
b7e44a744d
Add dedicated views for organizational models
2021-03-26 14:44:43 -04:00
Jeremy Stretch
bb00f2ff46
Introduce paginate_table() utility to simplify table pagination
2021-03-26 13:02:55 -04:00
Jeremy Stretch
c828806b67
Merge branch 'develop' into feature
2021-03-25 16:09:28 -04:00
Jeremy Stretch
d18652f726
Fixes #6012 : Pre-populate attributes when creating an available child prefix via the UI
2021-03-25 15:04:56 -04:00
checktheroads
21d31b5747
fix prefix table styles
2021-03-19 09:38:26 -07:00
Jeremy Stretch
e4ecd2dae9
Fixes #6006 : Fix VLAN group/site association for bulk prefix import
2021-03-19 10:22:30 -04:00
checktheroads
58841e85db
update css classes for bootstrap 5 colors
2021-03-17 23:31:15 -07:00
Jeremy Stretch
433c48a1a3
Fix IP address interface validation
2021-03-17 16:44:34 -04:00
Jeremy Stretch
889316085c
Closes #5998 : Introduce ContentTypeColumn
2021-03-17 16:29:43 -04:00
Jeremy Stretch
1f1a62da67
Initial work on #151 : Object journaling
2021-03-16 15:00:08 -04:00
Jeremy Stretch
c64f96d65b
Drop usage of display_field on DynamicModelChoiceFields
2021-03-16 10:29:15 -04:00
Jeremy Stretch
fb48c1f6dd
Add 'display' field to all REST API serializers
2021-03-16 10:06:25 -04:00
Jeremy Stretch
f64f205e81
Omit prefetch_related() for VLANGroup
2021-03-15 20:58:23 -04:00
Jeremy Stretch
10778f8479
Merge branch 'feature' into 5284-vlangroup-scope
2021-03-15 20:48:55 -04:00
Jeremy Stretch
bb6360cad4
Fix up VLANGroup tests
2021-03-15 20:35:18 -04:00
Jeremy Stretch
c0c4eed3a8
Extend VLANGroup to support cluster/cluster group assignment
2021-03-15 16:32:07 -04:00
Jeremy Stretch
61d23df83a
Closes #5972 : Bulk edit support for organizational models ( #5974 )
...
* Enable bulk editing of organizational models
* Enable bulk editing of nested group models
* Changelog for #5972
2021-03-12 16:14:42 -05:00
Jeremy Stretch
fca5accba8
Clean up base serializers
2021-03-12 13:31:28 -05:00
Jeremy Stretch
fadf15dbc0
Fix VLAN group assignment for VLANs
2021-03-11 11:07:27 -05:00
Jeremy Stretch
6ab1c06036
Extend VLAN group assignment form
2021-03-10 16:50:04 -05:00
Jeremy Stretch
d3fee54644
Fix VLAN.clean()
2021-03-10 16:26:27 -05:00
Jeremy Stretch
f4e49495e2
Merge branch 'feature' into 5284-vlangroup-scope
2021-03-10 14:51:11 -05:00
Jeremy Stretch
fc5bb966f0
Declare TaggableManager on PrimaryModel base class
2021-03-10 14:32:50 -05:00
Jeremy Stretch
653af17755
Merge branch 'feature' into 5284-vlangroup-scope
2021-03-09 20:17:47 -05:00
Jeremy Stretch
bac2387f50
Merge branch 'develop' into feature
2021-03-09 20:04:20 -05:00
Jeremy Stretch
4dae781be0
Change VLANGroup site to scope (GFK)
2021-03-09 16:18:59 -05:00
Jeremy Stretch
cae784ff52
Merge pull request #5928 from wobcom/feature/ip-actions-in-interface-view
...
Add IP action buttons to interface view
2021-03-08 16:58:53 -05:00
Jeremy Stretch
61e5eff666
Fixes #5935 : Fix filtering prefixes list by multiple prefix values
2021-03-08 16:27:12 -05:00
Jeremy Stretch
16a3d1339a
Closes #5592 : Add IP addresses count to VRF view
2021-03-08 15:57:17 -05:00
Jeremy Stretch
79b19821f6
Closes #5892 : Introduce SiteGroup model ( #5937 )
...
* Initial work on #5892
* Add site group selection to object edit forms
* Add documentation for site groups
* Changelog for #5892
* Finish application of site groups to config context
2021-03-08 13:28:53 -05:00
Jeremy Stretch
7a5cf80412
Clean up extraneous imports
2021-03-05 12:48:53 -05:00
Julian Jacobi
ad1da22257
Add IP action buttons to interface view
2021-03-05 10:45:58 +01:00
Jeremy Stretch
e703d9ff78
Introduce UtilizationColumn to render utilization graphs consistently
2021-03-04 20:58:43 -05:00
