Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ba8f48af65 
					 
					
						
						
							
							Merge branch 'develop' into develop-2.1  
						
						... 
						
						
						
						Conflicts:
	netbox/netbox/settings.py 
						
						
					 
					
						2017-06-15 14:26:02 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						da3879e928 
					 
					
						
						
							
							Fixes   #1275 : Raise validation error on prefix import when multiple VLANs are found  
						
						
						
						
					 
					
						2017-06-15 14:13:20 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a16218b311 
					 
					
						
						
							
							Fixes   #1273 : Corrected status choices in IP address import form  
						
						
						
						
					 
					
						2017-06-14 16:22:49 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f427c00d94 
					 
					
						
						
							
							Closes   #819 : Implemented IP address functional roles  
						
						
						
						
					 
					
						2017-06-14 16:11:13 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						252ab0fbab 
					 
					
						
						
							
							Fixes   #1238 : Fix error when editing an IP with a NAT assignment which has no assigned device  
						
						
						
						
					 
					
						2017-06-13 16:57:25 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						05a796faf1 
					 
					
						
						
							
							Closes   #704 : Allow filtering VLANs by group when editing prefixes  
						
						
						
						
					 
					
						2017-06-09 14:15:12 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						65b6fe576f 
					 
					
						
						
							
							Converted device fields to use FlexibleModelChoiceField; misc cleanup  
						
						
						
						
					 
					
						2017-06-07 15:51:11 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0a6e4f31d5 
					 
					
						
						
							
							Updated CSVForm validation  
						
						
						
						
					 
					
						2017-06-07 14:19:08 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e6c4ce51f7 
					 
					
						
						
							
							Replaced all CSVForm ChoiceFields with CSVChoiceField  
						
						
						
						
					 
					
						2017-06-07 13:22:06 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c82658440f 
					 
					
						
						
							
							Converted IPAM import views to new scheme  
						
						
						
						
					 
					
						2017-06-02 16:07:11 -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 
							
						 
					 
					
						
						
							
						
						f21c6bca00 
					 
					
						
						
							
							Import unicode_literals  
						
						
						
						
					 
					
						2017-05-24 11:33:11 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f9328d53b4 
					 
					
						
						
							
							Fixes   #1197 : Fixed status assignment during bulk import of devices, prefixes, IPs, and VLANs  
						
						
						
						
					 
					
						2017-05-17 17:16:02 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e351ab0171 
					 
					
						
						
							
							Fixes   #1186 : Corrected VLAN edit form so that site assignment is not required  
						
						
						
						
					 
					
						2017-05-16 16:30:28 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d87acc97c3 
					 
					
						
						
							
							Fixes   #1171 : Allow removing site assignment when bulk editing VLANs  
						
						
						
						
					 
					
						2017-05-12 12:06:37 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f9b2c59974 
					 
					
						
						
							
							Moved tenancy to separate panel on bulk IP creation form  
						
						
						
						
					 
					
						2017-05-12 12:04:06 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a870a3b918 
					 
					
						
						
							
							Fixes   #1166 : Re-implemented bulk IP address creation  
						
						
						
						
					 
					
						2017-05-12 12:00:26 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ed80bfaf02 
					 
					
						
						
							
							Fixed selector initializations for TenancyForms  
						
						
						
						
					 
					
						2017-05-11 17:52:23 -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 
							
						 
					 
					
						
						
							
						
						58bb029666 
					 
					
						
						
							
							Closes   #1167 : Introduced ChainedModelChoiceFields  
						
						
						
						
					 
					
						2017-05-11 16:30:16 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9ad9ef7957 
					 
					
						
						
							
							Fixed incorrect API URL in IPAddressForm  
						
						
						
						
					 
					
						2017-05-09 11:11:30 -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 
							
						 
					 
					
						
						
							
						
						aea5612c39 
					 
					
						
						
							
							Closes   #1110 : Expand bulk edit forms to include boolean fields (e.g. toggle is_pool for prefixes)  
						
						
						
						
					 
					
						2017-04-28 12:32:27 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						616f109671 
					 
					
						
						
							
							Merge branch 'develop' into v2-develop  
						
						... 
						
						
						
						Conflicts:
	netbox/ipam/forms.py 
						
						
					 
					
						2017-04-27 15:29:40 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e7a6d1f532 
					 
					
						
						
							
							Fixes   #1104 : Fix VLAN assignment on prefix import  
						
						
						
						
					 
					
						2017-04-26 13:28:09 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						480faa6461 
					 
					
						
						
							
							Removed deprecated IPAddressAssignForm  
						
						
						
						
					 
					
						2017-04-26 13:03:18 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1fa084b6be 
					 
					
						
						
							
							Fixes   #1101 : Fix AJAX scripting for device component selection forms  
						
						
						
						
					 
					
						2017-04-26 12:53:14 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f73693206f 
					 
					
						
						
							
							Merge branch 'develop' into v2-develop  
						
						... 
						
						
						
						Conflicts:
	netbox/circuits/models.py
	netbox/netbox/settings.py
	upgrade.sh 
						
						
					 
					
						2017-04-21 15:07:48 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						401357b8cb 
					 
					
						
						
							
							Closes   #1084 : Include custom fields when creating IP addresses in bulk  
						
						
						
						
					 
					
						2017-04-19 14:50:58 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a98c9ed0af 
					 
					
						
						
							
							Corrected invalid API URL name  
						
						
						
						
					 
					
						2017-04-17 15:52: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 
							
						 
					 
					
						
						
							
						
						d3b16ba443 
					 
					
						
						
							
							Fixes   #1057 : Corrected VLAN validation during prefix import  
						
						
						
						
					 
					
						2017-04-07 14:50:08 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						57fc6a3f50 
					 
					
						
						
							
							Merge branch 'develop' into v2-develop  
						
						... 
						
						
						
						Conflicts:
	netbox/netbox/settings.py
	netbox/netbox/urls.py
	requirements.txt 
						
						
					 
					
						2017-04-06 17:01:13 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						7766e1f684 
					 
					
						
						
							
							Fixes   #1037 : Fixed error on VLAN import with duplicate VLAN group names  
						
						
						
						
					 
					
						2017-04-05 10:13:19 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						2bb6387dae 
					 
					
						
						
							
							Fixes   #1028 : Corrected API endpoint URL name in IPAddressForm  
						
						
						
						
					 
					
						2017-04-03 17:11:22 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Moody 
							
						 
					 
					
						
						
							
						
						22bfac746e 
					 
					
						
						
							
							fix remaining legacy api url paths.  
						
						
						
						
					 
					
						2017-03-24 18:58:19 -05:00 
						 
				 
			
				
					
						
							
							
								Zach Moody 
							
						 
					 
					
						
						
							
						
						48141c0693 
					 
					
						
						
							
							Fixes   #996  
						
						
						
						
					 
					
						2017-03-24 17:38:06 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f8381628d4 
					 
					
						
						
							
							Fixes   #941 : Corrected old references to rack.site on Device  
						
						
						
						
					 
					
						2017-03-06 10:23:24 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						db60e8868c 
					 
					
						
						
							
							Closes   #901 : Support for filtering prefixes and IP addresses by mask length  
						
						
						
						
					 
					
						2017-03-01 14:23:52 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1adae67dd7 
					 
					
						
						
							
							Closes   #927 : Upgrade to django-filter 1.0  
						
						
						
						
					 
					
						2017-03-01 13:09:19 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b0f9035e2d 
					 
					
						
						
							
							Additional work on  #904  
						
						
						
						
					 
					
						2017-02-21 14:53:22 -05:00 
						 
				 
			
				
					
						
							
							
								Shawn Peng 
							
						 
					 
					
						
						
							
						
						aba9748ffd 
					 
					
						
						
							
							Fix   #235 : Enable global vlan ( #904 )  
						
						... 
						
						
						
						* Fix  #235 : Enable global vlan
Decouple site/vlan, make site optional for vlan/vlangroup
Change html generation code to check site existence before
dereference
Create site search function, if site is None for a VLAN, view it as
global VLAN
* commit1
* commit2
* commit3
* Add migration file for VLAN&VLAN group
* Revert unintentional commits 
						
						
					 
					
						2017-02-21 13:27:24 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						198ed859ff 
					 
					
						
						
							
							Closes   #198 : Support for rackless devices ( #902 )  
						
						... 
						
						
						
						* Initial work to support rackless devices
* Updated device component connection forms
* Updated IP address assignment form
* Updated circuit termination form
* Formatting cleanup
* Fixed tests 
						
						
					 
					
						2017-02-17 14:48:00 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1317c0dd8c 
					 
					
						
						
							
							Closes   #841 : Merged search and filter forms on all object lists  
						
						
						
						
					 
					
						2017-01-24 12:05:39 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c264281530 
					 
					
						
						
							
							Add an empty label (global) to IPAddressBulkAddForm VRF field  
						
						
						
						
					 
					
						2017-01-17 15:33:55 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						07997b24ca 
					 
					
						
						
							
							Fixes   #785 : Trigger validation error when importing a prefix assigned to a nonexistent VLAN  
						
						
						
						
					 
					
						2017-01-17 15:01:30 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8edaff860c 
					 
					
						
						
							
							Fixes   #658 : Added is_pool field to Prefix model  
						
						
						
						
					 
					
						2016-12-27 15:07:52 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						37b2ff02e7 
					 
					
						
						
							
							Standardized inheritance order of BootstrapMixin  
						
						
						
						
					 
					
						2016-12-21 14:15:18 -05:00