jeremystretch
							
						 
					 | 
					
						
						
							
						
						57a78b3cad
					 | 
					
						
						
							
							Clean up device/devicetype tab views
						
						
						
						
						
						
					 | 
					
						2021-12-21 10:28:28 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matt
							
						 
					 | 
					
						
						
							
						
						e8ba4b0564
					 | 
					
						
						
							
							#6797: Improve controls & custom link styling
						
						
						
						
						
						
					 | 
					
						2021-08-03 10:21:06 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeremystretch
							
						 
					 | 
					
						
						
							
						
						ebe7779f40
					 | 
					
						
						
							
							Use button role names instead of color shades
						
						
						
						
						
						
					 | 
					
						2021-07-20 21:21:03 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeremystretch
							
						 
					 | 
					
						
						
							
						
						a5dda0705e
					 | 
					
						
						
							
							Standardize button colors
						
						
						
						
						
						
					 | 
					
						2021-07-20 13:46:59 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeremystretch
							
						 
					 | 
					
						
						
							
						
						856956afce
					 | 
					
						
						
							
							Standardize object breadcrumbs
						
						
						
						
						
						
					 | 
					
						2021-07-20 12:14:01 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeremystretch
							
						 
					 | 
					
						
						
							
						
						456ffb79ff
					 | 
					
						
						
							
							Merge v2.11.2
						
						
						
						
						
						
					 | 
					
						2021-04-27 14:05:38 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeremystretch
							
						 
					 | 
					
						
						
							
						
						9a588231c5
					 | 
					
						
						
							
							Fixes #6289: Fix assignment of VC member interfaces to LAG interfaces
						
						
						
						
						
						
					 | 
					
						2021-04-27 09:36:48 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						5e4878843e
					 | 
					
						
						
							
							fix custom link rendering
						
						
						
						
						
						
					 | 
					
						2021-04-23 09:31:16 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						de65ffb99d
					 | 
					
						
						
							
							fix napalm tab layout from merge conflict
						
						
						
						
						
						
					 | 
					
						2021-04-14 16:11:25 -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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						83c4577f6d
					 | 
					
						
						
							
							Merge branch 'develop' into feature
						
						
						
						
						
						
					 | 
					
						2021-03-31 17:11:54 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						b7309d5c69
					 | 
					
						
						
							
							Closes #6054: Display NAPALM-enabled device tabs only when relevant
						
						
						
						
						
						
					 | 
					
						2021-03-31 15:21:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						3869028d53
					 | 
					
						
						
							
							Clean up organizational object URLs
						
						
						
						
						
						
					 | 
					
						2021-03-29 16:17:25 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						1f1a62da67
					 | 
					
						
						
							
							Initial work on #151: Object journaling
						
						
						
						
						
						
					 | 
					
						2021-03-16 15:00:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						187f4fa4aa
					 | 
					
						
						
							
							fix device & device component templates
						
						
						
						
						
						
					 | 
					
						2021-03-14 17:26:33 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						4c60a602b9
					 | 
					
						
						
							
							bootstrap 5 template updates
						
						
						
						
						
						
					 | 
					
						2021-03-13 11:16:29 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						9b89afd6dc
					 | 
					
						
						
							
							begin bootstrap 5 migration, update templates
						
						
						
						
						
						
					 | 
					
						2021-03-13 02:19:42 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						51120ccf31
					 | 
					
						
						
							
							Introduce generic object template
						
						
						
						
						
						
					 | 
					
						2021-03-02 15:58:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						137aa9da2c
					 | 
					
						
						
							
							Fixes #5648: Include VC member interfaces on interfaces tab count when viewing VC master
						
						
						
						
						
						
					 | 
					
						2021-01-25 14:29:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						f7e61cc153
					 | 
					
						
						
							
							Fixes #5417: Fix exception when viewing a device installed within a device bay
						
						
						
						
						
						
					 | 
					
						2020-12-04 15:21:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						790e1ee2e4
					 | 
					
						
						
							
							Update created_updated.html
						
						
						
						
						
						
					 | 
					
						2020-11-19 13:44:34 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						e2d2ff8586
					 | 
					
						
						
							
							Standardize on "object" for ObjectView template context
						
						
						
						
						
						
					 | 
					
						2020-11-19 11:29:18 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						d0e6e9c837
					 | 
					
						
						
							
							Correct return URLs for device component actions
						
						
						
						
						
						
					 | 
					
						2020-11-13 15:37:34 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						9736d6ba48
					 | 
					
						
						
							
							Separate device component lists into discrete views
						
						
						
						
						
						
					 | 
					
						2020-11-13 15:00:12 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |