jeremystretch 
							
						 
					 
					
						
						
							
						
						cf4a55bc2f 
					 
					
						
						
							
							Closes   #8107 : Correct template name  
						
						 
						
						
						
						
					 
					
						2021-12-18 13:52:39 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jeremystretch 
							
						 
					 
					
						
						
							
						
						83b2102705 
					 
					
						
						
							
							Closes   #7769 : Enable assignment of IP addresses to an existing FHRP group  
						
						 
						
						
						
						
					 
					
						2021-11-11 14:05:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jeremystretch 
							
						 
					 
					
						
						
							
						
						9089f5cf67 
					 
					
						
						
							
							#7450 : Clean up object edit forms  
						
						 
						
						
						
						
					 
					
						2021-10-05 15:37:49 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jeremystretch 
							
						 
					 
					
						
						
							
						
						66619cdc2f 
					 
					
						
						
							
							Clean up object edit forms  
						
						 
						
						
						
						
					 
					
						2021-08-25 15:03:19 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jeremystretch 
							
						 
					 
					
						
						
							
						
						545474a1a3 
					 
					
						
						
							
							Clean up object edit forms  
						
						 
						
						
						
						
					 
					
						2021-08-24 13:59:54 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jeremystretch 
							
						 
					 
					
						
						
							
						
						8653b0f3d0 
					 
					
						
						
							
							Tabify object add/edit views  
						
						 
						
						
						
						
					 
					
						2021-08-06 16:16:19 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jeremystretch 
							
						 
					 
					
						
						
							
						
						d42138384f 
					 
					
						
						
							
							Use shaded tabs  
						
						 
						
						
						
						
					 
					
						2021-07-21 10:13:30 -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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						c53990c739 
					 
					
						
						
							
							Closes   #5307 : Add a region selector for every site form field  
						
						 
						
						
						
						
					 
					
						2020-11-04 15:27:41 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0e91d837a0 
					 
					
						
						
							
							Allow selecting NAT IP address by assigned virtual machine  
						
						 
						
						
						
						
					 
					
						2020-08-13 10:42:19 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						eadd2d6854 
					 
					
						
						
							
							Remove obsolete livesearch Javascript  
						
						 
						
						
						
						
					 
					
						2020-08-11 12:56:27 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bd24eebbf2 
					 
					
						
						
							
							Fixes   #4952 : Default to VM tab when creating/editing an IP address for a VM  
						
						 
						
						
						
						
					 
					
						2020-08-05 09:29:29 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4d2c75a824 
					 
					
						
						
							
							Restore ability to assign interface when editing an IPAddress  
						
						 
						
						
						
						
					 
					
						2020-06-24 11:30:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bb6be8e3d3 
					 
					
						
						
							
							Disable editing assigned interface under IPAddress form  
						
						 
						
						
						
						
					 
					
						2020-06-22 16:36:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						15ab30d0c6 
					 
					
						
						
							
							Replace model_name and model_name_verbose filters with meta  
						
						 
						
						
						
						
					 
					
						2020-03-09 10:50:46 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kobayashi 
							
						 
					 
					
						
						
							
						
						3c5346f60a 
					 
					
						
						
							
							Fixes   #3978 : VRF filtering for NAT IP search  
						
						 
						
						
						
						
					 
					
						2020-01-28 10:22:28 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a026ec45b8 
					 
					
						
						
							
							Closes   #166 : Add dns_name to IPAddress  
						
						 
						
						
						
						
					 
					
						2019-04-22 18:10:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Anderson 
							
						 
					 
					
						
						
							
						
						ad4fb3ce8b 
					 
					
						
						
							
							IPAM Select2 forms and changelog  
						
						 
						
						
						
						
					 
					
						2019-01-10 21:19:13 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0a71c63583 
					 
					
						
						
							
							Upgraded to Django 2.1  
						
						 
						
						
						
						
					 
					
						2018-11-02 14:42:15 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9b3869790d 
					 
					
						
						
							
							Implemented tags for all primary models  
						
						 
						
						
						
						
					 
					
						2018-05-10 12:53:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fa95191792 
					 
					
						
						
							
							Allowed assigning an IP address to either a device or a VM  
						
						 
						
						
						
						
					 
					
						2017-08-29 15:26:35 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f427c00d94 
					 
					
						
						
							
							Closes   #819 : Implemented IP address functional roles  
						
						 
						
						
						
						
					 
					
						2017-06-14 16:11:13 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1dd5e2c926 
					 
					
						
						
							
							Fixes   #1229 : Fix validation error on forms where API search is used  
						
						 
						
						
						
						
					 
					
						2017-05-25 14:33:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						473b35f9a3 
					 
					
						
						
							
							Added tenant_group/tenant form section to all objects with tenancy  
						
						 
						
						
						
						
					 
					
						2017-05-11 17:35:20 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5ca87c0f20 
					 
					
						
						
							
							Merge branch 'develop' into v2-develop  
						
						 
						
						
						
						
					 
					
						2017-05-08 15:02:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d861d8bfb8 
					 
					
						
						
							
							Fixes   #1118 : Allow designating an IP as primary for a device while editing the IP  
						
						 
						
						
						
						
					 
					
						2017-05-02 16:46:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b01bf6089c 
					 
					
						
						
							
							Merge branch 'develop' into v2-develop  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/dcim/forms.py
	netbox/dcim/views.py
	netbox/ipam/forms.py
	netbox/templates/_base.html
	netbox/utilities/views.py 
						
						
					 
					
						2017-04-13 15:42:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						09000ad9b3 
					 
					
						
						
							
							Closes   #1001 : Merged IP interface assignment into ipam.IPAddressForm  
						
						 
						
						
						
						
					 
					
						2017-04-13 14:54:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3ed3e93b25 
					 
					
						
						
							
							Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade  
						
						 
						
						
						
						
					 
					
						2017-03-30 15:40:00 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9fd9719d0b 
					 
					
						
						
							
							Closes   #181 : Implemented support for bulk IP address creation  
						
						 
						
						
						
						
					 
					
						2016-12-20 15:39:22 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bf817eb69e 
					 
					
						
						
							
							Closes   #49 : Introduction of circuit terminations  
						
						 
						
						
						
						
					 
					
						2016-12-14 13:47:22 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e22eafc4a7 
					 
					
						
						
							
							Closes   #211 : Allow device assignment and removal from IP address view  
						
						 
						
						
						
						
					 
					
						2016-10-24 15:07:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						13243785f1 
					 
					
						
						
							
							Closes   #87 : Added status field to IP addresses  
						
						 
						
						
						
						
					 
					
						2016-10-21 12:34:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6cdb62b67e 
					 
					
						
						
							
							Minimal implemtnation of custom fields  
						
						 
						
						
						
						
					 
					
						2016-08-15 15:24:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e6c06b39e8 
					 
					
						
						
							
							Adds tenant assignment to Prefix and IPAddress objects  
						
						 
						
						
						
						
					 
					
						2016-07-28 13:50:46 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ed07b235a2 
					 
					
						
						
							
							Pulled in all third-party resources and standardized on static template tag  
						
						 
						
						
						
						
					 
					
						2016-06-21 13:26:19 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						950a6ea7b2 
					 
					
						
						
							
							Introduced a common template for object editing  
						
						 
						
						
						
						
					 
					
						2016-05-09 14:11:53 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						171f2c008f 
					 
					
						
						
							
							Converted IPAM Prefix, IPAddress, VLAN add/edit/delete views to CBVs  
						
						 
						
						
						
						
					 
					
						2016-05-09 13:10:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Moody 
							
						 
					 
					
						
						
							
						
						03d5540fc8 
					 
					
						
						
							
							netbox: adjusted where IP address form buttons rendered to be  
						
						 
						
						... 
						
						
						
						more in line with other two-column add/edit pages. 
						
						
					 
					
						2016-03-06 20:37:46 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						27b289ee3b 
					 
					
						
						
							
							Initial push to public repo  
						
						 
						
						
						
						
					 
					
						2016-03-01 11:23:03 -05:00