jeremystretch
							
						 
					 | 
					
						
						
							
						
						f3abf84e17
					 | 
					
						
						
							
							Closes #6154: Allow decimal values for cable lengths
						
						
						
						
						
						
					 | 
					
						2021-05-10 14:14:54 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeremystretch
							
						 
					 | 
					
						
						
							
						
						456ffb79ff
					 | 
					
						
						
							
							Merge v2.11.2
						
						
						
						
						
						
					 | 
					
						2021-04-27 14:05:38 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeremystretch
							
						 
					 | 
					
						
						
							
						
						87b4cfff1a
					 | 
					
						
						
							
							Closes #6278: Note device locations on cable traces
						
						
						
						
						
						
					 | 
					
						2021-04-26 15:31:53 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						59256cf8b3
					 | 
					
						
						
							
							update cable trace styles
						
						
						
						
						
						
					 | 
					
						2021-04-15 16:53:04 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						96759af86f
					 | 
					
						
						
							
							Closes #6071: Cable traces now traverse circuits
						
						
						
						
						
						
					 | 
					
						2021-04-01 14:31:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						9b89afd6dc
					 | 
					
						
						
							
							begin bootstrap 5 migration, update templates
						
						
						
						
						
						
					 | 
					
						2021-03-13 02:19:42 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chris Mills
							
						 
					 | 
					
						
						
							
						
						e739d6aa05
					 | 
					
						
						
							
							Fix white cables
						
						
						
						
						
						
					 | 
					
						2021-01-20 23:52:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						2c7fc5df75
					 | 
					
						
						
							
							Closes #5411: Include cable tags in trace view
						
						
						
						
						
						
					 | 
					
						2020-12-04 15:56:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						83daadd575
					 | 
					
						
						
							
							Highlight the current termination
						
						
						
						
						
						
					 | 
					
						2020-11-16 16:07:29 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						e84a6b99a8
					 | 
					
						
						
							
							Improved cable trace UI
						
						
						
						
						
						
					 | 
					
						2020-11-12 16:55:02 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						867f308027
					 | 
					
						
						
							
							Replace Font Awesome icons with Material Design
						
						
						
						
						
						
					 | 
					
						2020-11-06 14:33:20 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						35759fdb70
					 | 
					
						
						
							
							Redo the cable trace UI (WIP)
						
						
						
						
						
						
					 | 
					
						2020-10-07 16:39:15 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |