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 
							
						 
					 
					
						
						
							
						
						610b412506 
					 
					
						
						
							
							#878 : Layout tweaks  
						
						 
						
						
						
						
					 
					
						2017-04-13 15:09:08 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						09000ad9b3 
					 
					
						
						
							
							Closes   #1001 : Merged IP interface assignment into ipam.IPAddressForm  
						
						 
						
						
						
						
					 
					
						2017-04-13 14:54:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d5c3f9e780 
					 
					
						
						
							
							#878 : Show assigned IP addresses in device interfaces list  
						
						 
						
						
						
						
					 
					
						2017-04-12 22:02:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b42dab3eef 
					 
					
						
						
							
							Differentiate between LAG and virtual interfaces in device interface list  
						
						 
						
						
						
						
					 
					
						2017-04-12 16:06:36 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						576e21eb65 
					 
					
						
						
							
							Merge branch 'develop' into v2-develop  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/netbox/settings.py 
						
						
					 
					
						2017-03-23 17:14:41 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						66a6a8f33c 
					 
					
						
						
							
							Closes   #983 : Include peer device names when listing circuits in device view  
						
						 
						
						
						
						
					 
					
						2017-03-22 16:58:56 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						22768ff6c6 
					 
					
						
						
							
							Renamed Module to InventoryItem (prep for  #824 )  
						
						 
						
						
						
						
					 
					
						2017-03-21 12:54:08 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8f42f59a80 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py 
						
						
					 
					
						2017-02-27 17:04:08 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c6970e1998 
					 
					
						
						
							
							Closes   #105 : Interface groups ( #919 )  
						
						 
						
						... 
						
						
						
						* Initial work on interface groups
* Simplify to a single LAG form factor
* Correct interface serializer
* Allow for bulk editing of interface LAG
* Additional LAG interface validation
* Fixed API tests 
						
						
					 
					
						2017-02-27 16:52:13 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f1518226bd 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/dcim/api/serializers.py 
						
						
					 
					
						2017-02-17 15:12:53 -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 
							
						 
					 
					
						
						
							
						
						b71566f206 
					 
					
						
						
							
							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 
						
						
					 
					
						2017-02-16 14:28:06 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						181539651f 
					 
					
						
						
							
							Rack reservations ( #900 )  
						
						 
						
						... 
						
						
						
						* Initial work on rack reservations
* Added views for rack reservations
* Implemented ArrayFieldSelectMultiple form widget
* Implemented API endpoints for rack reservations
* Tweaked the database migration 
						
						
					 
					
						2017-02-16 13:46:58 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						37f250ddc1 
					 
					
						
						
							
							Corrected API URL names  
						
						 
						
						
						
						
					 
					
						2017-02-03 16:54:13 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						52420945b2 
					 
					
						
						
							
							Standardized naming of return_url for all object views  
						
						 
						
						
						
						
					 
					
						2017-01-23 14:07:26 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						39d083eae7 
					 
					
						
						
							
							Re-implemented method for bulk editing/deleting all objects within a filtered queryset  
						
						 
						
						
						
						
					 
					
						2017-01-20 16:42:11 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3eb969de0c 
					 
					
						
						
							
							Standardized the use of return_url for ObjectDeleteView  
						
						 
						
						
						
						
					 
					
						2017-01-18 13:30:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9ff59ab686 
					 
					
						
						
							
							Closes   #760 : Redirect user back to device view after deleting an assigned IP address  
						
						 
						
						
						
						
					 
					
						2017-01-18 12:25:07 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						dbf9840b26 
					 
					
						
						
							
							Corrected permissions for device component form rendering  
						
						 
						
						
						
						
					 
					
						2017-01-05 15:37:15 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						09fe328c3f 
					 
					
						
						
							
							Standardized template names  
						
						 
						
						
						
						
					 
					
						2017-01-05 15:31:41 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e647065e63 
					 
					
						
						
							
							Improved device interface list performance  
						
						 
						
						
						
						
					 
					
						2016-12-27 13:21:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e8684240a7 
					 
					
						
						
							
							Added permissions evaluation  
						
						 
						
						
						
						
					 
					
						2016-12-21 17:28:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c1b6da771f 
					 
					
						
						
							
							Only display "select all" button if there are two or more items  
						
						 
						
						
						
						
					 
					
						2016-12-21 17:26:25 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c94d111401 
					 
					
						
						
							
							Closes   #743 : Enabled bulk creation of all device components  
						
						 
						
						
						
						
					 
					
						2016-12-16 16:29:32 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f02c222d4f 
					 
					
						
						
							
							Closes   #539 : Implemented L4 services for devices  
						
						 
						
						
						
						
					 
					
						2016-12-15 15:32:58 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bf817eb69e 
					 
					
						
						
							
							Closes   #49 : Introduction of circuit terminations  
						
						 
						
						
						
						
					 
					
						2016-12-14 13:47:22 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						298ac1ba7a 
					 
					
						
						
							
							Widened page layout; improved mobile rendering  
						
						 
						
						
						
						
					 
					
						2016-12-09 16:23:11 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bd40f72ad5 
					 
					
						
						
							
							#49 : Allow selection of devices at other sites when connecting an interface  
						
						 
						
						
						
						
					 
					
						2016-12-09 11:43:50 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d5095362d7 
					 
					
						
						
							
							Fixes   #734 : Corrected display of device type when editing a device  
						
						 
						
						
						
						
					 
					
						2016-12-08 09:59:21 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						da216e2c22 
					 
					
						
						
							
							Fixes   #727 : Corrected error in rack elevation display  
						
						 
						
						
						
						
					 
					
						2016-12-06 15:27:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						300ee820fa 
					 
					
						
						
							
							#672 : Cleaned up rack elevation CSS  
						
						 
						
						
						
						
					 
					
						2016-12-05 18:11:07 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bbac6e2ba6 
					 
					
						
						
							
							Fixes   #664 : Re-implemented view for bulk creation of interfaces across multiple devices  
						
						 
						
						
						
						
					 
					
						2016-11-02 16:43:24 -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 
							
						 
					 
					
						
						
							
						
						2db50dd4a7 
					 
					
						
						
							
							Closes   #191 : Support for racks numbered top-to-bottom  
						
						 
						
						
						
						
					 
					
						2016-10-28 11:30:40 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4405bc4182 
					 
					
						
						
							
							Closes   #608 : Add "toggle all" button to device and device type components  
						
						 
						
						
						
						
					 
					
						2016-10-19 15:45:26 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c09cb5df3d 
					 
					
						
						
							
							#353 : Added bulk editing for InterfaceTemplates  
						
						 
						
						
						
						
					 
					
						2016-10-19 12:15:54 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3503c77699 
					 
					
						
						
							
							Fixes   #591 : Correct display of component creation buttons in device type view  
						
						 
						
						
						
						
					 
					
						2016-10-04 10:17:56 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d5fc0e9ce7 
					 
					
						
						
							
							Closes   #345 : Bulk edit: allow user to select all objects on page or all matching query  
						
						 
						
						
						
						
					 
					
						2016-09-28 16:56:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						30c7c2d359 
					 
					
						
						
							
							Closes   #475 : Display add buttons at top and bottom of all device/device type panels  
						
						 
						
						
						
						
					 
					
						2016-09-28 12:06:00 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						989ec721d3 
					 
					
						
						
							
							Fixes   #472 : Hide the connection button for interfaces which have a circuit terminated to them  
						
						 
						
						
						
						
					 
					
						2016-08-16 09:29:20 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1fd189f9b1 
					 
					
						
						
							
							Replaced most glyphicons with Font Awesome  
						
						 
						
						
						
						
					 
					
						2016-08-01 13:29:45 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bcb9ab7116 
					 
					
						
						
							
							Show graphs button only if there is at least one graph to display  
						
						 
						
						
						
						
					 
					
						2016-07-29 13:19:58 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						38aee33df0 
					 
					
						
						
							
							Closes   #358 : Improved search of all objects  
						
						 
						
						
						
						
					 
					
						2016-07-29 12:51:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4be5c33905 
					 
					
						
						
							
							Enabled bulk deletion of device bays, interfaces, console server ports, and power outlets from devices  
						
						 
						
						
						
						
					 
					
						2016-07-26 10:14:51 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						dd62caf2f0 
					 
					
						
						
							
							Fixes   #227 : Introduces support for bulk import of child devices  
						
						 
						
						
						
						
					 
					
						2016-07-14 17:35:52 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						46b1ac23af 
					 
					
						
						
							
							Allow for setting mgmt_only=True in "Add management interfaces" link  
						
						 
						
						
						
						
					 
					
						2016-07-14 11:39:53 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4e4bb01a55 
					 
					
						
						
							
							Initial work on  #93 : Primary IPv4/IPv6 support  
						
						 
						
						
						
						
					 
					
						2016-07-11 16:24:46 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						891a128736 
					 
					
						
						
							
							Cleaned up 'not connected' text  
						
						 
						
						
						
						
					 
					
						2016-07-06 16:01:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c0ab9f70dc 
					 
					
						
						
							
							Standardized console/power/interface display  
						
						 
						
						
						
						
					 
					
						2016-07-06 14:40:40 -04:00