jeremystretch
							
						 
					 | 
					
						
						
							
						
						7be684835b
					 | 
					
						
						
							
							Introduce an inclusion template for object comments
						
						
						
						
						
						
					 | 
					
						2021-07-21 14:20:14 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeremystretch
							
						 
					 | 
					
						
						
							
						
						88e382e7a1
					 | 
					
						
						
							
							Merge v2.11.8 changes
						
						
						
						
						
						
					 | 
					
						2021-07-06 12:10:29 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeremystretch
							
						 
					 | 
					
						
						
							
						
						18a9e39be6
					 | 
					
						
						
							
							Closes #6667: Display VM memory as GB/TB as appropriate
						
						
						
						
						
						
					 | 
					
						2021-06-29 14:00:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Sheppard
							
						 
					 | 
					
						
						
							
						
						744792452f
					 | 
					
						
						
							
							Closes: #5278 - Remove Secrets (#6397)
						
						
						
						
						
						
						
						* Remove Secrets
* #5278: Remove secrets javascript from netbox core
* Remove userkey references
* Fix PEP8
* Remove a few more instances of secrets.  Rebundle
* Remove Secrets
Co-authored-by: checktheroads <matt@allroads.io> 
						
						
					 | 
					
						2021-05-17 16:26:02 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						460a203c29
					 | 
					
						
						
							
							Add basic support for smaller screens
						
						
						
						
						
						
					 | 
					
						2021-04-30 15:55:37 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						5e4878843e
					 | 
					
						
						
							
							fix custom link rendering
						
						
						
						
						
						
					 | 
					
						2021-04-23 09:31:16 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						03390815af
					 | 
					
						
						
							
							migrate table config to typescript & update templates
						
						
						
						
						
						
					 | 
					
						2021-04-19 17:00:09 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						c9fe7f6db6
					 | 
					
						
						
							
							migrate cluster templates to bootstrap 5
						
						
						
						
						
						
					 | 
					
						2021-04-17 18:35:09 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								checktheroads
							
						 
					 | 
					
						
						
							
						
						c035af5409
					 | 
					
						
						
							
							migrate virtual machine & vm interface to bootstrap 5
						
						
						
						
						
						
					 | 
					
						2021-04-17 18:15:53 -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
							
						 
					 | 
					
						
						
							
						
						3869028d53
					 | 
					
						
						
							
							Clean up organizational object URLs
						
						
						
						
						
						
					 | 
					
						2021-03-29 16:17:25 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						0364d8cd43
					 | 
					
						
						
							
							Closes #6014: Move virtual machine interfaces list to a separate view
						
						
						
						
						
						
					 | 
					
						2021-03-26 20:19:19 -04: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
							
						 
					 | 
					
						
						
							
						
						3c887b0dd9
					 | 
					
						
						
							
							Fixes #5468: Fix unlocking secrets from device/VM view
						
						
						
						
						
						
					 | 
					
						2020-12-16 13:48:44 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						1d922ee813
					 | 
					
						
						
							
							Migrate all ObjectView subclasses to use get_extra_context()
						
						
						
						
						
						
					 | 
					
						2020-11-19 15:59:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						d237b97776
					 | 
					
						
						
							
							Update custom_fields_panel.html
						
						
						
						
						
						
					 | 
					
						2020-11-19 13:53:37 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						790e1ee2e4
					 | 
					
						
						
							
							Update created_updated.html
						
						
						
						
						
						
					 | 
					
						2020-11-19 13:44:34 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						d5d87e0fdd
					 | 
					
						
						
							
							Update templates to use "object" context var
						
						
						
						
						
						
					 | 
					
						2020-11-19 13:22:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						11fa348575
					 | 
					
						
						
							
							Fixes #5358: Fix user table configuration for VM interfaces
						
						
						
						
						
						
					 | 
					
						2020-11-19 09:45:01 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						9736d6ba48
					 | 
					
						
						
							
							Separate device component lists into discrete views
						
						
						
						
						
						
					 | 
					
						2020-11-13 15:00:12 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						62b0a68bef
					 | 
					
						
						
							
							Don't use chevron-right icon for hierarchy
						
						
						
						
						
						
					 | 
					
						2020-11-06 16:26:16 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						72dace29b7
					 | 
					
						
						
							
							Replace Glyphicons with Material Design
						
						
						
						
						
						
					 | 
					
						2020-11-06 14:49:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						867f308027
					 | 
					
						
						
							
							Replace Font Awesome icons with Material Design
						
						
						
						
						
						
					 | 
					
						2020-11-06 14:33:20 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						502b66367c
					 | 
					
						
						
							
							Convert VM interfaces list to table
						
						
						
						
						
						
					 | 
					
						2020-10-16 17:01:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						00caa368c5
					 | 
					
						
						
							
							Remove interface IPs toggle
						
						
						
						
						
						
					 | 
					
						2020-10-16 16:40:21 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						c986321402
					 | 
					
						
						
							
							Fix "add secret" link for VMs
						
						
						
						
						
						
					 | 
					
						2020-09-21 10:54:04 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						43f3e682c5
					 | 
					
						
						
							
							Support assignment of secrets to virtual machines
						
						
						
						
						
						
					 | 
					
						2020-09-18 15:39:41 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						d47ea04ec4
					 | 
					
						
						
							
							Add "add interfaces" button to virtual machine view
						
						
						
						
						
						
					 | 
					
						2020-07-13 16:59:46 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						052555c3f7
					 | 
					
						
						
							
							Add bulk renaming function for VM interfaces
						
						
						
						
						
						
					 | 
					
						2020-06-24 10:02:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						9a0bc16c86
					 | 
					
						
						
							
							Update device/VM interface templates
						
						
						
						
						
						
					 | 
					
						2020-06-24 09:52:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						25d6bbf659
					 | 
					
						
						
							
							Update view and permission names for VMInterface
						
						
						
						
						
						
					 | 
					
						2020-06-23 14:48:37 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						19a10cee82
					 | 
					
						
						
							
							Rename base template
						
						
						
						
						
						
					 | 
					
						2020-04-10 10:21:02 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								John Anderson
							
						 
					 | 
					
						
						
							
						
						8364694fb4
					 | 
					
						
						
							
							added plugin template content injection to primary model detail views
						
						
						
						
						
						
					 | 
					
						2020-03-15 23:45:18 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						16d3cebf3e
					 | 
					
						
						
							
							Update markdown filter name
						
						
						
						
						
						
					 | 
					
						2020-03-09 10:42:32 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						1423fd9024
					 | 
					
						
						
							
							Rename gfm filter to render_markdown
						
						
						
						
						
						
					 | 
					
						2020-03-09 10:31:29 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						2cf990bd92
					 | 
					
						
						
							
							Standardize on two-word form of "change log"
						
						
						
						
						
						
					 | 
					
						2020-02-19 12:45:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						75906f7591
					 | 
					
						
						
							
							Move component bulk creation views to new URLs
						
						
						
						
						
						
					 | 
					
						2020-02-05 12:36:38 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						57a0cf0a33
					 | 
					
						
						
							
							Fix component bulk edit views
						
						
						
						
						
						
					 | 
					
						2020-02-05 10:28:39 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						f805b57778
					 | 
					
						
						
							
							Adapt BulkEditView to not require a parent object for device components
						
						
						
						
						
						
					 | 
					
						2020-02-04 18:08:40 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						c1639b7781
					 | 
					
						
						
							
							Move component bulk delete views to new URLs
						
						
						
						
						
						
					 | 
					
						2020-02-04 16:06:55 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						d9b8bc0422
					 | 
					
						
						
							
							Fix VM interfaces table header alignment
						
						
						
						
						
						
					 | 
					
						2020-01-30 13:39:50 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						a2ead6af94
					 | 
					
						
						
							
							Merge branch 'develop' into develop-2.7
						
						
						
						
						
						
					 | 
					
						2020-01-09 15:27:06 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Saria Hajjar
							
						 
					 | 
					
						
						
							
						
						6a3cd83efc
					 | 
					
						
						
							
							Moved regex note to tooltip
						
						
						
						
						
						
					 | 
					
						2020-01-07 11:09:39 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Saria Hajjar
							
						 
					 | 
					
						
						
							
						
						a7ec0c14f7
					 | 
					
						
						
							
							Move toggles js code to static
						
						
						
						
						
						
					 | 
					
						2020-01-07 11:09:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Saria Hajjar
							
						 
					 | 
					
						
						
							
						
						3556051d14
					 | 
					
						
						
							
							Height was a touch off
						
						
						
						
						
						
					 | 
					
						2020-01-03 19:58:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Saria Hajjar
							
						 
					 | 
					
						
						
							
						
						e1d1f522ff
					 | 
					
						
						
							
							Closes #3090: Filter field for interface
						
						
						
						
						
						
					 | 
					
						2020-01-03 19:38:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						8acd3d0a72
					 | 
					
						
						
							
							Introduced clone, edit, and delete buttons
						
						
						
						
						
						
					 | 
					
						2019-12-13 15:54:50 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						446acbdf82
					 | 
					
						
						
							
							Closes #33: Add ability to clone objects (pre-populate form fields)
						
						
						
						
						
						
					 | 
					
						2019-12-06 16:13:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						dd58e78fde
					 | 
					
						
						
							
							Add custom links to templates
						
						
						
						
						
						
					 | 
					
						2019-04-15 21:38:04 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |