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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9fd9719d0b 
					 
					
						
						
							
							Closes   #181 : Implemented support for bulk IP address creation  
						
						 
						
						
						
						
					 
					
						2016-12-20 15:39:22 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f02c222d4f 
					 
					
						
						
							
							Closes   #539 : Implemented L4 services for devices  
						
						 
						
						
						
						
					 
					
						2016-12-15 15:32:58 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f007b0dbde 
					 
					
						
						
							
							Closes   #695 : Added is_private field to RIR  
						
						 
						
						
						
						
					 
					
						2016-12-06 13:59:13 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9c7f55d8d0 
					 
					
						
						
							
							Fixes   #674 : Correct status assignment on IP address import  
						
						 
						
						
						
						
					 
					
						2016-11-10 15:01:05 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						96eaea7db9 
					 
					
						
						
							
							Miscellaneous cleanup  
						
						 
						
						
						
						
					 
					
						2016-11-03 14:15:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ad1c3d4910 
					 
					
						
						
							
							Fixed typo in error message  
						
						 
						
						
						
						
					 
					
						2016-11-01 15:44:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f2137683f9 
					 
					
						
						
							
							Closes   #647 : Extend form used when assigning an IP to a device  
						
						 
						
						
						
						
					 
					
						2016-11-01 13:59:24 -04: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 
							
						 
					 
					
						
						
							
						
						fc2ac8a02b 
					 
					
						
						
							
							Attributed all model ValidationErrors to specific fields (where appropriate)  
						
						 
						
						
						
						
					 
					
						2016-10-21 15:39:13 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						13243785f1 
					 
					
						
						
							
							Closes   #87 : Added status field to IP addresses  
						
						 
						
						
						
						
					 
					
						2016-10-21 12:34:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						464797858f 
					 
					
						
						
							
							Fixes   #604 : Correct display of unnamed devices in form selection fields  
						
						 
						
						
						
						
					 
					
						2016-10-13 15:21:36 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						36066068d4 
					 
					
						
						
							
							#527 : Initial work to allow nullifying fields during bulk edit  
						
						 
						
						
						
						
					 
					
						2016-09-30 16:17:41 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0444ac7db9 
					 
					
						
						
							
							Introduced NullableModelMultipleChoiceField to allow null filtering without causing introspection issues during database migrations  
						
						 
						
						
						
						
					 
					
						2016-09-20 15:48:58 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b2684aeefc 
					 
					
						
						
							
							status filter fields should not be required  
						
						 
						
						
						
						
					 
					
						2016-09-20 11:29:30 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6ccc6244dd 
					 
					
						
						
							
							Corrected PrefixFilterForm  
						
						 
						
						
						
						
					 
					
						2016-09-20 11:25:16 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e618bf40ec 
					 
					
						
						
							
							Reimplemented FilterChoiceField  
						
						 
						
						
						
						
					 
					
						2016-09-20 11:08:25 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9dea5656ad 
					 
					
						
						
							
							Added 'none' options to filters for optional fields  
						
						 
						
						
						
						
					 
					
						2016-09-15 17:12:53 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						daadf7a49b 
					 
					
						
						
							
							Fixes   #557 : Add 'global' choice to VRF filter for prefixes and IP addresses  
						
						 
						
						
						
						
					 
					
						2016-09-15 16:03:53 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						824d2d8205 
					 
					
						
						
							
							Implemented FilterChoiceField and get_filter_choices() to reduce filter form boilerplate  
						
						 
						
						
						
						
					 
					
						2016-09-14 16:27:26 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9591fb9330 
					 
					
						
						
							
							PEP8 fix  
						
						 
						
						
						
						
					 
					
						2016-09-13 12:10:21 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bef9a0c77f 
					 
					
						
						
							
							Added address family filters to aggregate and prefix lists  
						
						 
						
						
						
						
					 
					
						2016-09-13 10:35:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						74a5960992 
					 
					
						
						
							
							Added custom field support to filter forms  
						
						 
						
						
						
						
					 
					
						2016-08-23 12:05:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b14afaa687 
					 
					
						
						
							
							Updated bulk edit forms to support custom fields  
						
						 
						
						
						
						
					 
					
						2016-08-22 13:11:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6cdb62b67e 
					 
					
						
						
							
							Minimal implemtnation of custom fields  
						
						 
						
						
						
						
					 
					
						2016-08-15 15:24:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						31ebbb3324 
					 
					
						
						
							
							Fixes   #444 : Corrected prefix model validation  
						
						 
						
						
						
						
					 
					
						2016-08-09 09:50:50 -04:00