1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Commit Graph

83 Commits

Author SHA1 Message Date
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
96759af86f Closes #6071: Cable traces now traverse circuits 2021-04-01 14:31:10 -04:00
a9716af0fa Tweak table display for components marked as connected 2021-03-29 10:53:02 -04:00
7a3af8de83 Merge branch 'feature' of https://github.com/netbox-community/netbox into feature
# Conflicts:
#	netbox/dcim/tables/template_code.py
#	netbox/netbox/forms.py
#	netbox/templates/dcim/cable_connect.html
#	netbox/templates/dcim/consoleport.html
#	netbox/templates/dcim/consoleserverport.html
#	netbox/templates/dcim/device.html
#	netbox/templates/dcim/device/base.html
#	netbox/templates/dcim/device_edit.html
#	netbox/templates/dcim/interface.html
#	netbox/templates/dcim/rack.html
#	netbox/templates/dcim/rack_edit.html
#	netbox/templates/dcim/site.html
#	netbox/templates/extras/configcontext.html
#	netbox/templates/extras/objectchange.html
#	netbox/templates/generic/object.html
#	netbox/templates/inc/nav_menu.html
#	netbox/templates/ipam/ipaddress_edit.html
#	netbox/templates/ipam/vrf.html
#	netbox/utilities/templates/buttons/export.html
2021-03-17 22:02:43 -07:00
187f4fa4aa fix device & device component templates 2021-03-14 17:26:33 -07:00
9b89afd6dc begin bootstrap 5 migration, update templates 2021-03-13 02:19:42 -07:00
8e1fe6339e Rename parent attribute on CableTerminations to parent_object 2021-03-05 13:06:21 -05:00
e703d9ff78 Introduce UtilizationColumn to render utilization graphs consistently 2021-03-04 20:58:43 -05:00
32501c96e5 Introduce MPTTColumn to represent MPTT models 2021-03-04 20:47:24 -05:00
fdb3e3f9a4 Closes #5895: Rename RackGroup to Location 2021-03-03 13:30:33 -05:00
1430c0a6e6 Fixes #5738: Fix redirect to device components view after disconnecting a cable 2021-02-04 13:19:42 -05:00
ddd10ba8af Clean up hierarchical table columns 2020-12-22 16:14:16 -05:00
a80f13243e Clean up tagged VLANs table column 2020-12-02 15:57:55 -05:00
e2d2ff8586 Standardize on "object" for ObjectView template context 2020-11-19 11:29:18 -05:00
5f8b0cc40a Ensure consistent display of device component buttons 2020-11-13 15:29:37 -05:00
9736d6ba48 Separate device component lists into discrete views 2020-11-13 15:00:12 -05:00
2377e04911 Fix up device component tab navigation & return URLs 2020-11-10 11:46:04 -05:00
5db14f9410 Tweak CSS 2020-11-06 16:09:55 -05:00
6542a326c1 Clean up stray Font Awesome icons 2020-11-06 15:06:45 -05:00
72dace29b7 Replace Glyphicons with Material Design 2020-11-06 14:49:14 -05:00
55a2e0299c Standardize device component table columns 2020-10-19 13:55:02 -04:00
0a67926012 Fix up missing table columns 2020-10-16 16:33:08 -04:00
51821818e0 Add cable trace buttons 2020-10-16 16:14:05 -04:00
7c1316619b Convert device device bays list to table 2020-10-16 15:51:46 -04:00
2146c38748 Convert device interfaces list to table 2020-10-16 15:42:48 -04:00
e3f98a011c Convert device rear ports list to table 2020-10-16 15:33:39 -04:00
68060cf9e9 Convert device front ports list to table 2020-10-16 15:28:28 -04:00
eed2e4a15b Convert device power outlets list to table 2020-10-16 15:16:36 -04:00
3a47e0e2ed Convert device power ports list to table 2020-10-16 15:09:23 -04:00
60c30b92ba Convert device console server ports list to table 2020-10-16 15:01:16 -04:00
99352a5d30 Convert device console ports list to table 2020-10-16 14:39:15 -04:00
769b240164 Extend device component tables to include cable peer 2020-10-16 11:11:41 -04:00
73bf3b9498 Reorganize DCIM tables 2020-10-16 10:39:13 -04:00