jeremystretch 
							
						 
					 
					
						
						
							
						
						14f696e824 
					 
					
						
						
							
							Merge branch 'develop' into feature  
						
						
						
						
					 
					
						2021-06-14 09:23:01 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						809d9e4697 
					 
					
						
						
							
							Fixes   #6584 : Fix ordering of nested inventory items  
						
						
						
						
					 
					
						2021-06-10 14:27:42 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						b3ed545d6a 
					 
					
						
						
							
							Closes   #3682 : Add color field to front and rear ports  
						
						
						
						
					 
					
						2021-06-09 16:51:51 -04:00 
						 
				 
			
				
					
						
							
							
								checktheroads 
							
						 
					 
					
						
						
							
						
						e004f872f9 
					 
					
						
						
							
							Closes   #4247 : Add option to show/hide enabled/disabled interfaces on device  
						
						
						
						
					 
					
						2021-05-26 16:32:09 -07:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						534b0e4cf6 
					 
					
						
						
							
							Merge branch 'develop' into feature  
						
						
						
						
					 
					
						2021-05-04 14:25:53 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						fb1173bc30 
					 
					
						
						
							
							Fixes   #6339 : Improve ordering of interfaces when viewing virtual chassis master  
						
						
						
						
					 
					
						2021-05-04 09:12:26 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						456ffb79ff 
					 
					
						
						
							
							Merge v2.11.2  
						
						
						
						
					 
					
						2021-04-27 14:05:38 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						19a2b9042f 
					 
					
						
						
							
							Closes   #6275 : Linkify rack, device counts on locations list  
						
						
						
						
					 
					
						2021-04-26 15:28:35 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						52747e364a 
					 
					
						
						
							
							Fixes   #6254 : Disable ordering of space column in racks table  
						
						
						
						
					 
					
						2021-04-23 09:44:29 -04:00 
						 
				 
			
				
					
						
							
							
								checktheroads 
							
						 
					 
					
						
						
							
						
						eb55761c38 
					 
					
						
						
							
							Merge branch 'feature' of  https://github.com/netbox-community/netbox  into feature  
						
						... 
						
						
						
						# Conflicts:
#	netbox/project-static/js/forms.js
#	netbox/templates/dcim/location.html
#	netbox/templates/generic/object_list.html 
						
						
					 
					
						2021-04-22 19:19:03 -07:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						e6930d9601 
					 
					
						
						
							
							Closes   #6161 : Enable ordering of device component tables  
						
						
						
						
					 
					
						2021-04-20 20:21:52 -04: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 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						05d8a06cd5 
					 
					
						
						
							
							Closes   #6109 : Add device counts to locations table  
						
						
						
						
					 
					
						2021-04-08 10:08:50 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						59e185b781 
					 
					
						
						
							
							Fixes   #6104 : Fix location column on racks table  
						
						
						
						
					 
					
						2021-04-07 15:40:03 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						838200219f 
					 
					
						
						
							
							Include child regions, site groups  
						
						
						
						
					 
					
						2021-04-06 09:42:36 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						f0018dcba9 
					 
					
						
						
							
							LinkedCountColumn should always invoke filter by ID  
						
						
						
						
					 
					
						2021-04-05 11:47:25 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						d69ec7f8e4 
					 
					
						
						
							
							Add manufacturer column to DeviceTable  
						
						
						
						
					 
					
						2021-04-02 17:02:12 -04:00 
						 
				 
			
				
					
						
							
							
								jeremystretch 
							
						 
					 
					
						
						
							
						
						779837389b 
					 
					
						
						
							
							Convert all LinkColumns to Column(linkify=True)  
						
						
						
						
					 
					
						2021-04-02 16:59:53 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5e4432b9ad 
					 
					
						
						
							
							Show the last node in a CablePath with no destination  
						
						
						
						
					 
					
						2021-04-01 21:29:46 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						96759af86f 
					 
					
						
						
							
							Closes   #6071 : Cable traces now traverse circuits  
						
						
						
						
					 
					
						2021-04-01 14:31:10 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						83c4577f6d 
					 
					
						
						
							
							Merge branch 'develop' into feature  
						
						
						
						
					 
					
						2021-03-31 17:11:54 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9df2130e11 
					 
					
						
						
							
							Closes   #5840 : Add column to cable termination objects to display cable color  
						
						
						
						
					 
					
						2021-03-31 15:49:29 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8fa37d3ec8 
					 
					
						
						
							
							Device component lists should link to component-specific device view  
						
						
						
						
					 
					
						2021-03-29 14:49:22 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a9716af0fa 
					 
					
						
						
							
							Tweak table display for components marked as connected  
						
						
						
						
					 
					
						2021-03-29 10:53:02 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						2820d26a0f 
					 
					
						
						
							
							Add dedicated views for nested group models  
						
						
						
						
					 
					
						2021-03-26 15:07:29 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b7e44a744d 
					 
					
						
						
							
							Add dedicated views for organizational models  
						
						
						
						
					 
					
						2021-03-26 14:44:43 -04:00 
						 
				 
			
				
					
						
							
							
								checktheroads 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								checktheroads 
							
						 
					 
					
						
						
							
						
						187f4fa4aa 
					 
					
						
						
							
							fix device & device component templates  
						
						
						
						
					 
					
						2021-03-14 17:26:33 -07:00 
						 
				 
			
				
					
						
							
							
								checktheroads 
							
						 
					 
					
						
						
							
						
						9b89afd6dc 
					 
					
						
						
							
							begin bootstrap 5 migration, update templates  
						
						
						
						
					 
					
						2021-03-13 02:19:42 -07:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bac2387f50 
					 
					
						
						
							
							Merge branch 'develop' into feature  
						
						
						
						
					 
					
						2021-03-09 20:04:20 -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 
							
						 
					 
					
						
						
							
						
						e1a86139dc 
					 
					
						
						
							
							Add parent field to Interface  
						
						
						
						
					 
					
						2021-03-05 13:49:41 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8e1fe6339e 
					 
					
						
						
							
							Rename parent attribute on CableTerminations to parent_object  
						
						
						
						
					 
					
						2021-03-05 13:06:21 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e703d9ff78 
					 
					
						
						
							
							Introduce UtilizationColumn to render utilization graphs consistently  
						
						
						
						
					 
					
						2021-03-04 20:58:43 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						32501c96e5 
					 
					
						
						
							
							Introduce MPTTColumn to represent MPTT models  
						
						
						
						
					 
					
						2021-03-04 20:47:24 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						20a85c1ef2 
					 
					
						
						
							
							Introduce TenantColumn to simplify representation  
						
						
						
						
					 
					
						2021-03-04 16:07:55 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d750b690e7 
					 
					
						
						
							
							Closes   #4971 : Allow assigning devices to locations without a rack  
						
						
						
						
					 
					
						2021-03-03 14:28:07 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fdb3e3f9a4 
					 
					
						
						
							
							Closes   #5895 : Rename RackGroup to Location  
						
						
						
						
					 
					
						2021-03-03 13:30:33 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8de20fcd1f 
					 
					
						
						
							
							Closes   #5375 : Add 'speed' attribute to console port models  
						
						
						
						
					 
					
						2021-03-03 10:20:08 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8dd7123923 
					 
					
						
						
							
							Closes   #3648 : Mark cable termination models as connected without attaching a cable  
						
						
						
						
					 
					
						2021-03-01 21:34:42 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6a9b50f95d 
					 
					
						
						
							
							Closes   #5873 : Use numeric IDs in all object URLs  
						
						
						
						
					 
					
						2021-02-26 17:23:23 -05:00 
						 
				 
			
				
					
						
							
							
								Luke Anderson 
							
						 
					 
					
						
						
							
						
						d2c8aae59c 
					 
					
						
						
							
							Fix   #5819  and  #5872  - Fix Primary IP Sorting Issues for Devices and VMs  
						
						
						
						
					 
					
						2021-02-25 22:32:51 +10:30 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1430c0a6e6 
					 
					
						
						
							
							Fixes   #5738 : Fix redirect to device components view after disconnecting a cable  
						
						
						
						
					 
					
						2021-02-04 13:19:42 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1e1e2d5f54 
					 
					
						
						
							
							Fixes   #5597 : Fix ordering devices by primary IP address  
						
						
						
						
					 
					
						2021-01-11 11:28:03 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e9d888bf63 
					 
					
						
						
							
							Closes   #5570 : Add "management only" filter widget for interfaces list  
						
						
						
						
					 
					
						2021-01-07 11:29:59 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						7873952e7a 
					 
					
						
						
							
							Avoid wrapping text in hierarchical table columns  
						
						
						
						
					 
					
						2020-12-30 15:30:31 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ddd10ba8af 
					 
					
						
						
							
							Clean up hierarchical table columns  
						
						
						
						
					 
					
						2020-12-22 16:14:16 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						442dee72b5 
					 
					
						
						
							
							Fixes   #5499 : Fix filtering of displayed device/VM interfaces by regex  
						
						
						
						
					 
					
						2020-12-18 15:02:52 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a80f13243e 
					 
					
						
						
							
							Clean up tagged VLANs table column  
						
						
						
						
					 
					
						2020-12-02 15:57:55 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e2d2ff8586 
					 
					
						
						
							
							Standardize on "object" for ObjectView template context  
						
						
						
						
					 
					
						2020-11-19 11:29:18 -05:00