Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						77247cccbe 
					 
					
						
						
							
							Closes   #154 : Expand device status field options  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-08 13:55:19 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fcfcd77bfd 
					 
					
						
						
							
							Moved LAG members list to the description column  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-05 15:37:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b3667befb4 
					 
					
						
						
							
							Removed reduntant title block  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-05 15:24:58 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a6cb0e0a96 
					 
					
						
						
							
							Updated console/power connection icons  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-03 17:24:57 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c047f943de 
					 
					
						
						
							
							Fixes   #403 : Record console/power/interface connects and disconnects as user actions  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-03 17:12:34 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						79089cc47e 
					 
					
						
						
							
							Introduced an object import template  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-03 15:41:36 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3c631902e1 
					 
					
						
						
							
							Closes   #1100 : Add a "view all" link to completed bulk import views is_pool for prefixes  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-03 15:27:26 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						379c24a012 
					 
					
						
						
							
							Fixed typo in template  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-03 14:32:27 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Ellwood 
							
						 
					 
					
						
						
							
						
						4035b87693 
					 
					
						
						
							
							Allow responsive tables ( #1124 )  
						
						 
						
						... 
						
						
						
						* Make tables responsive #1115 
Resolves  #1115  
						
						
							
						
					 
					
						2017-05-03 14:30:05 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						11d1a8c3cf 
					 
					
						
						
							
							Merge pull request  #1128  from digitalocean/readme-branches  
						
						 
						
						... 
						
						
						
						Fix misleading build matrix 
						
						
							
						
					 
					
						2017-05-03 14:21:07 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						7eb9c8265c 
					 
					
						
						
							
							Fixes   #1132 : Prompt user to unlock session key when importing secrets  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-03 11:47:28 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Layher 
							
						 
					 
					
						
						
							
						
						572beb2311 
					 
					
						
						
							
							Fix misleading build matrix  
						
						 
						
						... 
						
						
						
						At one point, I had intended to have a matrix of build badges for each different branch and Python version combination.  It seems this is not possible with Travis.
This change replaces "python 2.7" with "status" and clarifies that both Python 2.7 and 3.5 are tested, but Python 3.5 is recommended. 
						
						
							
						
					 
					
						2017-05-02 20:39:43 -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 
							
						 
					 
					
						
						
							
						
						6791ff6192 
					 
					
						
						
							
							Fixes   #1125 : Include MAC addresses on a device's interface list  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-02 15:01:27 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9d9de6b2a3 
					 
					
						
						
							
							Fixes   #1126 : Fix error when editing a user key via admin UI  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-02 14:50:36 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1f7ef15ad1 
					 
					
						
						
							
							Fixes   #1116 : Correct object links on recursive deletion error  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-02 11:43:11 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						16c582ec7a 
					 
					
						
						
							
							Enable stale .pyc cleanup in upgrade.sh  
						
						 
						
						
						
						
							
						
					 
					
						2017-05-01 16:53:51 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						de58d0ecca 
					 
					
						
						
							
							Fixes   #1114 : Suppress OSError when attempting to access a delete image attachment  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-28 14:26:17 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						010f6c7f1a 
					 
					
						
						
							
							Fixes   #1113 : Fixes server error when attempting to delete an image attachment  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-28 14:05:02 -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 
							
						 
					 
					
						
						
							
						
						b8b912bdd5 
					 
					
						
						
							
							Post-release version adjustment  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-27 15:42:24 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e4ca88726e 
					 
					
						
						
							
							Release v2.0-beta3  
						
						 
						
						
						
						
							
  v2.0-beta3
 
						
					 
					
						2017-04-27 15:37:15 -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 
							
						 
					 
					
						
						
							
						
						8e0580ff96 
					 
					
						
						
							
							Improved upgrade script  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-27 14:42:52 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4b2e7620dd 
					 
					
						
						
							
							Switched user nav menu with search form  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-27 13:27:16 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b82f25c503 
					 
					
						
						
							
							Merge branch 'writable-custom-fields' into v2-develop  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-27 13:05:44 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c174c0cc6d 
					 
					
						
						
							
							Converted all necessary serializers to CustomFieldModelSerializers  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-27 12:50:43 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						117da337c7 
					 
					
						
						
							
							Corrected tests and improved validation  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-27 12:46:04 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						01da46f753 
					 
					
						
						
							
							Fixes   #1107 : Corrected exception on creating/deleting image attachments  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-27 11:32:08 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d17efce4f5 
					 
					
						
						
							
							Fixes   #1111 : Correct database ordering of SessionKey model  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-27 11:27:34 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e7a6d1f532 
					 
					
						
						
							
							Fixes   #1104 : Fix VLAN assignment on prefix import  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-26 13:28:09 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f643f2c601 
					 
					
						
						
							
							Fixes   #1103 : Correct handling of validation errors when creating IP addresses in bulk  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-26 13:21:38 -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 
							
						 
					 
					
						
						
							
						
						1c86b00b5c 
					 
					
						
						
							
							Added custom field API tests  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-25 14:53:18 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						10823e1c37 
					 
					
						
						
							
							Got rudimentary custom field creates/updates working  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-25 13:00:28 -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 
							
						 
					 
					
						
						
							
						
						861c8b29c0 
					 
					
						
						
							
							Post-release version bump  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-21 14:56:36 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5037046624 
					 
					
						
						
							
							Release v1.9.6  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-21 14:47:31 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5c0614d656 
					 
					
						
						
							
							#1090 : Python3 tweaks for installation on CentOS  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-21 14:37:47 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						697866d1ba 
					 
					
						
						
							
							#1090 : Tweaked docs for Python3 on Ubuntu  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-21 13:30:18 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						38d826d152 
					 
					
						
						
							
							Fixes   #1092 : Increase randomness in SECRET_KEY generation tool  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-21 10:32:10 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						13cc29cd8c 
					 
					
						
						
							
							Closes   #951 : Provide a side-by-side view of rack elevations  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-20 13:07:22 -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 
							
						 
					 
					
						
						
							
						
						599e1bb220 
					 
					
						
						
							
							Fixes   #1071 : Protect assigned circuit termination when an interface is deleted  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-19 13:19:30 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						864fa17b75 
					 
					
						
						
							
							Closes   #1008 : Moved Docker components into their own repository  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-19 10:58:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a98c9ed0af 
					 
					
						
						
							
							Corrected invalid API URL name  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-17 15:52:23 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8032aa1ad9 
					 
					
						
						
							
							Fixes   #1078 : Increase default limit for number of objects returned by web form API call  
						
						 
						
						
						
						
							
						
					 
					
						2017-04-17 15:50:00 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bellwood 
							
						 
					 
					
						
						
							
						
						5ff4e3b194 
					 
					
						
						
							
							Enhance LDAP documentation  
						
						 
						
						... 
						
						
						
						Incorporating @marvnrawley's enhancements from #518  
						
						
							
						
					 
					
						2017-04-13 17:03:58 -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