Nicholas Totsch 
							
						 
					 
					
						
						
							
						
						fbd39da8ca 
					 
					
						
						
							
							Add Tenancy to Rack Reservations;  Fixes   #1592  ( #1672 )  
						
						 
						
						... 
						
						
						
						* fixed prefix header to represent new serial "vlan_vid"
* shows option in creation now
* fixed visibility on rack page
* cleanup
* Added view to Tenant page
* Moved migration for update from #1666  and fixed tenant enumeration in FilterForm
* Fixed conflict #1 
* Fixed filters from merge and made migration merge
* added tenant to api
* Fixed migrations problem
* Added Tenant to bulkedit option 
						
						
					 
					
						2017-11-15 13:54:49 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e01e5e6b0e 
					 
					
						
						
							
							Standardize on JSON data format for all POST/PUT test client requests  
						
						 
						
						
						
						
					 
					
						2017-11-08 13:54:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						198170ca48 
					 
					
						
						
							
							Closes   #1553 : Introduced support for bulk object creation via the API  
						
						 
						
						
						
						
					 
					
						2017-11-07 15:36:10 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						00986fd7bf 
					 
					
						
						
							
							Closes   #1691 : Cleaned up and reorganized import statements  
						
						 
						
						
						
						
					 
					
						2017-11-07 11:08:23 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						85c273c8ca 
					 
					
						
						
							
							Fixes   #1670 : Corrected filter names (regression from  #1649 )  
						
						 
						
						
						
						
					 
					
						2017-10-31 14:47:14 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4668149943 
					 
					
						
						
							
							Fixes   #1649 : Correct fitlering on null values (e.g. ?tenant_id=0) for django-filters v1.1.0+  
						
						 
						
						
						
						
					 
					
						2017-10-30 17:20:22 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f824d1eb3b 
					 
					
						
						
							
							Closes   #1556 : Added API endpoints listing static field choices for each app  
						
						 
						
						
						
						
					 
					
						2017-10-10 16:41:35 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						42e557bd3f 
					 
					
						
						
							
							Added bulk import view for tenant groups  
						
						 
						
						
						
						
					 
					
						2017-10-09 15:09:40 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d651deb31c 
					 
					
						
						
							
							Renamed form_class attribute to model_form for consistency  
						
						 
						
						
						
						
					 
					
						2017-09-12 13:55:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6ebd8e78c8 
					 
					
						
						
							
							Added VMs to tenant view  
						
						 
						
						
						
						
					 
					
						2017-08-21 17:21:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c394985b1b 
					 
					
						
						
							
							Fixes   #1421 : Improved model validation logic for API serializers  
						
						 
						
						
						
						
					 
					
						2017-08-15 13:54:04 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						39730b6834 
					 
					
						
						
							
							Optimized performance when editing/deleting objects in bulk  
						
						 
						
						
						
						
					 
					
						2017-07-13 17:39: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						dc68be5abf 
					 
					
						
						
							
							Removed SearchTables; created DetailTables for models where needed  
						
						 
						
						
						
						
					 
					
						2017-07-12 16:42:45 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						74828e1409 
					 
					
						
						
							
							Fixes   #1334 : Fix server error when adding an interface to a device  
						
						 
						
						
						
						
					 
					
						2017-07-11 14:52:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1f9806a480 
					 
					
						
						
							
							Fixes   #1285 : Enforce model validation when creating/editing objects via the API  
						
						 
						
						
						
						
					 
					
						2017-07-06 17:37:24 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						87e5687d03 
					 
					
						
						
							
							Closes   #1203 : Implemented query filters for all models  
						
						 
						
						
						
						
					 
					
						2017-06-19 16:10:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						469c52be28 
					 
					
						
						
							
							Fixes   #1263 : Differentiate add and edit permissions for objects  
						
						 
						
						
						
						
					 
					
						2017-06-13 16:41:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						08883d86ef 
					 
					
						
						
							
							Closes   #913 : Added headers to object CSV exports  
						
						 
						
						
						
						
					 
					
						2017-06-09 16:24:59 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						08c8bd3049 
					 
					
						
						
							
							Renamed new import view to BulkImportView  
						
						 
						
						
						
						
					 
					
						2017-06-05 15:53:41 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						af604aba31 
					 
					
						
						
							
							Converted secrets import view to new scheme  
						
						 
						
						
						
						
					 
					
						2017-06-02 17:23:41 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4a8147f8a5 
					 
					
						
						
							
							Converted circuits import views to new scheme  
						
						 
						
						
						
						
					 
					
						2017-06-02 13:40:52 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a598f0e632 
					 
					
						
						
							
							Initial work on  #655 : CSV import headers  
						
						 
						
						
						
						
					 
					
						2017-05-31 17:40: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 
							
						 
					 
					
						
						
							
						
						138cbf9761 
					 
					
						
						
							
							Created migrations for transition to Unicode literals  
						
						 
						
						
						
						
					 
					
						2017-05-24 14:18:52 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f21c6bca00 
					 
					
						
						
							
							Import unicode_literals  
						
						 
						
						
						
						
					 
					
						2017-05-24 11:33:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fb85867d72 
					 
					
						
						
							
							Converted all object views to class-based views  
						
						 
						
						
						
						
					 
					
						2017-05-18 17:00:57 -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 
							
						 
					 
					
						
						
							
						
						ed65721085 
					 
					
						
						
							
							Fixes   #1160 : Linkify secrets and tenants in global search results  
						
						 
						
						
						
						
					 
					
						2017-05-10 13:16:33 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c174c0cc6d 
					 
					
						
						
							
							Converted all necessary serializers to CustomFieldModelSerializers  
						
						 
						
						
						
						
					 
					
						2017-04-27 12:50:43 -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 
							
						 
					 
					
						
						
							
						
						f70f0f8d62 
					 
					
						
						
							
							Improved handling of return_url for object edit/delete views; removed manual definitions of initial data fields  
						
						 
						
						
						
						
					 
					
						2017-04-13 13:11:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d98e9e1838 
					 
					
						
						
							
							Resolved RemovedInDjango20Warning deprecation warnings  
						
						 
						
						
						
						
					 
					
						2017-04-05 14:40:25 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						369d3aa62e 
					 
					
						
						
							
							Rearranged URL namespaces to satisfy deprecation warnings  
						
						 
						
						
						
						
					 
					
						2017-04-05 14:26:33 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a5dc91c175 
					 
					
						
						
							
							Introduced SearchTable for improved performance  
						
						 
						
						
						
						
					 
					
						2017-03-29 16:05:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						58e4bf1cc3 
					 
					
						
						
							
							Closes   #973 : Removed extraneous admin UI functions  
						
						 
						
						
						
						
					 
					
						2017-03-28 16:41:53 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						04e09c0078 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/circuits/filters.py 
						
						
					 
					
						2017-03-22 09:48:41 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						05b71564d8 
					 
					
						
						
							
							Closes   #981 : Allow filtering primary objects by a given set of IDs  
						
						 
						
						
						
						
					 
					
						2017-03-22 09:39:30 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6cb36a6cee 
					 
					
						
						
							
							Fixed browsable API breadcrumbs  
						
						 
						
						
						
						
					 
					
						2017-03-20 21:50:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						42fd14f5c0 
					 
					
						
						
							
							Introduced HttpStatusMixin to provide more detail on HTTP response status test failures  
						
						 
						
						
						
						
					 
					
						2017-03-20 13:46:47 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c08fae8bce 
					 
					
						
						
							
							Restore not-so-extraneous 'id' field to all WritableSerializers  
						
						 
						
						
						
						
					 
					
						2017-03-17 17:32:43 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e544f1fa1e 
					 
					
						
						
							
							Removed extraneous 'id' field from all WritableSerializers  
						
						 
						
						
						
						
					 
					
						2017-03-17 16:20:34 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bbc355df07 
					 
					
						
						
							
							Improved create/update validation  
						
						 
						
						
						
						
					 
					
						2017-03-16 14:17:14 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d58f9031d1 
					 
					
						
						
							
							Wrote tests for tenancy API  
						
						 
						
						
						
						
					 
					
						2017-03-16 13:29:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6c2ed1be22 
					 
					
						
						
							
							Standardized API URL definitions  
						
						 
						
						
						
						
					 
					
						2017-03-09 13:24:02 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a6ceaf8d96 
					 
					
						
						
							
							Moved custom field serializers to their own module to avoid circular dependency  
						
						 
						
						
						
						
					 
					
						2017-03-08 16:18:41 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9b39ba169c 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/urls.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py
	netbox/dcim/tables.py
	requirements.txt 
						
						
					 
					
						2017-03-02 16:01:25 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1adae67dd7 
					 
					
						
						
							
							Closes   #927 : Upgrade to django-filter 1.0  
						
						 
						
						
						
						
					 
					
						2017-03-01 13:09:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0e04d20762 
					 
					
						
						
							
							Re-implemented CustomFieldSerializer (read-only for now)  
						
						 
						
						
						
						
					 
					
						2017-02-09 16:55:54 -05:00