checktheroads 
							
						 
					 
					
						
						
							
						
						f7c1bc71d9 
					 
					
						
						
							
							migrate templates to bootstrap 5  
						
						 
						
						
						
						
					 
					
						2021-04-18 16:42:28 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								checktheroads 
							
						 
					 
					
						
						
							
						
						eb951fdaf1 
					 
					
						
						
							
							migrate secrets to bootstrap 5 and deprecate jquery functions  
						
						 
						
						
						
						
					 
					
						2021-04-17 17:18:13 -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 
							
						 
					 
					
						
						
							
						
						3869028d53 
					 
					
						
						
							
							Clean up organizational object URLs  
						
						 
						
						
						
						
					 
					
						2021-03-29 16:17:25 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b7e44a744d 
					 
					
						
						
							
							Add dedicated views for organizational models  
						
						 
						
						
						
						
					 
					
						2021-03-26 14:44:43 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						51120ccf31 
					 
					
						
						
							
							Introduce generic object template  
						
						 
						
						
						
						
					 
					
						2021-03-02 15:58:33 -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 
							
						 
					 
					
						
						
							
						
						3c887b0dd9 
					 
					
						
						
							
							Fixes   #5468 : Fix unlocking secrets from device/VM view  
						
						 
						
						
						
						
					 
					
						2020-12-16 13:48:44 -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 
							
						 
					 
					
						
						
							
						
						e2d2ff8586 
					 
					
						
						
							
							Standardize on "object" for ObjectView template context  
						
						 
						
						
						
						
					 
					
						2020-11-19 11:29:18 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a3675854be 
					 
					
						
						
							
							Clean up generic view templates  
						
						 
						
						
						
						
					 
					
						2020-11-11 16:58:29 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						867f308027 
					 
					
						
						
							
							Replace Font Awesome icons with Material Design  
						
						 
						
						
						
						
					 
					
						2020-11-06 14:33:20 -05: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 
							
						 
					 
					
						
						
							
						
						ec095e58b7 
					 
					
						
						
							
							#1503 : Initial work on generic secret assignments (WIP)  
						
						 
						
						
						
						
					 
					
						2020-09-18 14:51:09 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e6bc55af85 
					 
					
						
						
							
							#4969 : Remove user and group assignment from SecretRole  
						
						 
						
						
						
						
					 
					
						2020-08-07 16:19:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bae050e689 
					 
					
						
						
							
							Replace legacy add/edit secret views with SecretEditView  
						
						 
						
						
						
						
					 
					
						2020-05-22 11:24:49 -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 
							
						 
					 
					
						
						
							
						
						a28509019a 
					 
					
						
						
							
							Closes   #4363 : Standardize secret creation URL  
						
						 
						
						
						
						
					 
					
						2020-03-12 21:14:14 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						2cf990bd92 
					 
					
						
						
							
							Standardize on two-word form of "change log"  
						
						 
						
						
						
						
					 
					
						2020-02-19 12:45:52 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a054aff3c4 
					 
					
						
						
							
							Migrate secrets views to use common object list template  
						
						 
						
						
						
						
					 
					
						2020-02-13 14:19:14 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5bf85597ed 
					 
					
						
						
							
							Fixes   #4146 : Fix SecretRole permissions enforcement  
						
						 
						
						
						
						
					 
					
						2020-02-12 11:13:32 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saria Hajjar 
							
						 
					 
					
						
						
							
						
						2949bfaaa7 
					 
					
						
						
							
							Merge branch 'develop' into 2921-tags-select2  
						
						 
						
						
						
						
					 
					
						2020-01-16 15:33:42 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saria Hajjar 
							
						 
					 
					
						
						
							
						
						834fd408bd 
					 
					
						
						
							
							Fixes   #2921 : Replace tags filter with Select2 widget  
						
						 
						
						
						
						
					 
					
						2020-01-11 15:18:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8acd3d0a72 
					 
					
						
						
							
							Introduced clone, edit, and delete buttons  
						
						 
						
						
						
						
					 
					
						2019-12-13 15:54:50 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f8fdca4968 
					 
					
						
						
							
							Initial work on JSON/YAML-based DeviceType import  
						
						 
						
						
						
						
					 
					
						2019-09-13 16:18:29 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						dd58e78fde 
					 
					
						
						
							
							Add custom links to templates  
						
						 
						
						
						
						
					 
					
						2019-04-15 21:38:04 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b29944d5d7 
					 
					
						
						
							
							Check view permissions for object navigation tabs  
						
						 
						
						
						
						
					 
					
						2019-04-12 09:29:36 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dansheps 
							
						 
					 
					
						
						
							
						
						c208d8fc2e 
					 
					
						
						
							
							* Added CSS to:  
						
						 
						
						... 
						
						
						
						* Hide URLs
  * Hide elements with "noprint" class
* Added noprint to:
  * Header Panel
  * Search Panel, Tags Panel
  * Buttons
  * Various list elements
  * Related elements 
						
						
					 
					
						2019-03-05 15:42:47 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hSaria 
							
						 
					 
					
						
						
							
						
						298152bc50 
					 
					
						
						
							
							Closes   #2638 : Copy Button for Secrets ( #2860 )  
						
						 
						
						... 
						
						
						
						* Added clipboard.min.js
* Added copy button to secrets
* renamed clipboard JS library 
						
						
					 
					
						2019-02-21 13:26:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						045856c9ac 
					 
					
						
						
							
							Introduced a placeholder template filter  
						
						 
						
						
						
						
					 
					
						2018-11-05 13:00:46 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0a71c63583 
					 
					
						
						
							
							Upgraded to Django 2.1  
						
						 
						
						
						
						
					 
					
						2018-11-02 14:42:15 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						97b6038be2 
					 
					
						
						
							
							Cleaned up custom fields panel template  
						
						 
						
						
						
						
					 
					
						2018-07-20 19:56:04 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5cf38b5ce9 
					 
					
						
						
							
							Enabled export templates for secrets  
						
						 
						
						
						
						
					 
					
						2018-07-17 10:34:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0c0799f3bf 
					 
					
						
						
							
							Closes   #1739 : Enabled custom fields for secrets  
						
						 
						
						
						
						
					 
					
						2018-07-17 09:43:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4802e516e5 
					 
					
						
						
							
							Arranged object tags into a separate panel  
						
						 
						
						
						
						
					 
					
						2018-07-10 10:48:33 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						edf53d4516 
					 
					
						
						
							
							Flip the order of tag and URL name for the tag template tag  
						
						 
						
						
						
						
					 
					
						2018-07-05 15:20:13 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3c2e0b0b17 
					 
					
						
						
							
							Added changelog views  
						
						 
						
						
						
						
					 
					
						2018-06-14 16:15:14 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1d1553275e 
					 
					
						
						
							
							Added tags panel to object list view  
						
						 
						
						
						
						
					 
					
						2018-05-18 15:43:21 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e6b3983a4e 
					 
					
						
						
							
							Added template tag for tag links  
						
						 
						
						
						
						
					 
					
						2018-05-18 11:09:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9b3869790d 
					 
					
						
						
							
							Implemented tags for all primary models  
						
						 
						
						
						
						
					 
					
						2018-05-10 12:53:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						376c531fe4 
					 
					
						
						
							
							Template libraries cleanup  
						
						 
						
						
						
						
					 
					
						2018-02-07 13:35:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b96e3af6c7 
					 
					
						
						
							
							Closes   #1714 : Standardized CSV export functionality for all object lists  
						
						 
						
						
						
						
					 
					
						2018-02-02 16:12:57 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d888aa67f9 
					 
					
						
						
							
							Fixes   #1715 : Added missing import buttons on object lists  
						
						 
						
						
						
						
					 
					
						2017-11-15 12:52:21 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8403e91fc9 
					 
					
						
						
							
							Fixes   #1567 : Prompt user for session key when importing secrets  
						
						 
						
						
						
						
					 
					
						2017-10-10 13:22:40 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						12d643694f 
					 
					
						
						
							
							Cleaned up title blocks  
						
						 
						
						
						
						
					 
					
						2017-08-02 13:15:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						dd1991f2c6 
					 
					
						
						
							
							Closes   #838 : Display details of all objects being edited/deleted in bulk  
						
						 
						
						
						
						
					 
					
						2017-07-13 16:31:47 -04:00