checktheroads
							
						 
					 | 
					
						
						
							
						
						07f34c2675
					 | 
					
						
						
							
							#6372: Migrate away from form-floating field styles
						
						
						
						
						
						
					 | 
					
						2021-07-20 00:16:13 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						22e484edd4
					 | 
					
						
						
							
							#6732: Change “Update” button to “Save”
						
						
						
						
						
						
					 | 
					
						2021-05-07 17:02:22 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						61ce2c95b3
					 | 
					
						
						
							
							migrate templates to bootstrap 5
						
						
						
						
						
						
					 | 
					
						2021-04-18 00:22:52 -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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						d1d2ad6a5c
					 | 
					
						
						
							
							bootstrap 5 class updates
						
						
						
						
						
						
					 | 
					
						2021-04-13 21:51:12 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeremystretch
							
						 
					 | 
					
						
						
							
						
						a3721a94ce
					 | 
					
						
						
							
							Closes #6121: Extend parent interface assignment to VM interfaces
						
						
						
						
						
						
					 | 
					
						2021-04-09 10:53:05 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						ac0c54cce4
					 | 
					
						
						
							
							#5401: Add custom field support for VMInterface
						
						
						
						
						
						
					 | 
					
						2021-03-10 13:49:10 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						cef8204f40
					 | 
					
						
						
							
							Merge tags fields with primary object fields in form display
						
						
						
						
						
						
					 | 
					
						2021-02-25 14:03:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						a3675854be
					 | 
					
						
						
							
							Clean up generic view templates
						
						
						
						
						
						
					 | 
					
						2020-11-11 16:58:29 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						08c492f1f4
					 | 
					
						
						
							
							Merge develop into develop-2.10
						
						
						
						
						
						
					 | 
					
						2020-09-04 16:09:05 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						5ad5994b9d
					 | 
					
						
						
							
							Update interface view templates
						
						
						
						
						
						
					 | 
					
						2020-06-23 15:09:32 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |