Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9d419de9dc 
					 
					
						
						
							
							Merge branch 'develop-2.4' into 1898-activity-logging  
						
						 
						
						
						
						
					 
					
						2018-06-21 16:53:15 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b945dec41b 
					 
					
						
						
							
							Closes   #1687 : Enabled custom fields for services  
						
						 
						
						
						
						
					 
					
						2018-06-21 16:17:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						7819d9c112 
					 
					
						
						
							
							Closes   #1673 : Added object/list views for services  
						
						 
						
						
						
						
					 
					
						2018-06-21 15:55:27 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						09212691e2 
					 
					
						
						
							
							Added changelog links for organizational models  
						
						 
						
						
						
						
					 
					
						2018-06-20 14:54:04 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3c2e0b0b17 
					 
					
						
						
							
							Added changelog views  
						
						 
						
						
						
						
					 
					
						2018-06-14 16:15:14 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						21c4085c51 
					 
					
						
						
							
							Moved object header templates into object base templates  
						
						 
						
						
						
						
					 
					
						2018-06-14 13:34:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1d1553275e 
					 
					
						
						
							
							Added tags panel to object list view  
						
						 
						
						
						
						
					 
					
						2018-05-18 15:43:21 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e6b3983a4e 
					 
					
						
						
							
							Added template tag for tag links  
						
						 
						
						
						
						
					 
					
						2018-05-18 11:09:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9b3869790d 
					 
					
						
						
							
							Implemented tags for all primary models  
						
						 
						
						
						
						
					 
					
						2018-05-10 12:53:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4ec6e52e73 
					 
					
						
						
							
							Closes   #1990 : Improved search function when assigning an IP address to an interface  
						
						 
						
						
						
						
					 
					
						2018-03-29 09:45:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						38a208242b 
					 
					
						
						
							
							Closes   #1945 : Implemented a VLAN members view  
						
						 
						
						
						
						
					 
					
						2018-03-15 15:33:13 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9e4f2a9614 
					 
					
						
						
							
							Fixed panel heading CSS class  
						
						 
						
						
						
						
					 
					
						2018-02-15 10:01:02 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						376c531fe4 
					 
					
						
						
							
							Template libraries cleanup  
						
						 
						
						
						
						
					 
					
						2018-02-07 13:35:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b96e3af6c7 
					 
					
						
						
							
							Closes   #1714 : Standardized CSV export functionality for all object lists  
						
						 
						
						
						
						
					 
					
						2018-02-02 16:12:57 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e58d1ac87e 
					 
					
						
						
							
							Fixes   #1807 : Populate VRF from parent when creating a new prefix  
						
						 
						
						
						
						
					 
					
						2018-01-05 15:31:48 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						50395aa821 
					 
					
						
						
							
							Closes   #1773 : Moved child prefixes table to its own view  
						
						 
						
						
						
						
					 
					
						2017-12-20 14:01:37 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						252be84bf0 
					 
					
						
						
							
							Corrected tenant inheritance for new IP addresses created from a parent prefix  
						
						 
						
						
						
						
					 
					
						2017-11-22 13:00:48 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						40ab272995 
					 
					
						
						
							
							Fixes   #1721 : Differentiated child IP count from utilization percentage for prefixes  
						
						 
						
						
						
						
					 
					
						2017-11-22 12:40:58 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e50b7174bf 
					 
					
						
						
							
							Closes   #1669 : Clicking "add an IP" from the prefix view will default to the first available IP within the prefix  
						
						 
						
						
						
						
					 
					
						2017-11-15 15:26:00 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d888aa67f9 
					 
					
						
						
							
							Fixes   #1715 : Added missing import buttons on object lists  
						
						 
						
						
						
						
					 
					
						2017-11-15 12:52:21 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a0bb7b08bd 
					 
					
						
						
							
							Closes   #1512 : Added a view to search for an IP address being assigned to an interface  
						
						 
						
						
						
						
					 
					
						2017-11-10 11:58:59 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ichabond 
							
						 
					 
					
						
						
							
						
						b8df05cf88 
					 
					
						
						
							
							Fixes   #1655 . Removed explicit field references. ( #1656 )  
						
						 
						
						... 
						
						
						
						* Fixes  #1655 
Further field name references were found in `consoleport.html`. These have now been removed, so we rely on proper a proper `__str__` implementation of both `ConsolePort` and `ConsoleServerPort`.
* Fixes  #1655 : Removed explicit field references
Cleaned up all (notable) .name references, and removed them so __str__ can do the lifting. Did not remove the references where it was explicitly referenced to .name (eg. in details). Extended the Secret model to also include the name in __str__, since that was weirdly absent.
* Adapted PR to comply with comments
Re-introduced certain references to make sure explicit references are still used where needed. 
						
						
					 
					
						2017-11-02 11:51:27 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						007f930fed 
					 
					
						
						
							
							Merge branch 'develop' into develop-2.2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/utilities/api.py 
						
						
					 
					
						2017-10-11 10:47:21 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b69bf58c63 
					 
					
						
						
							
							Closes   #1548 : Automatically populate tenant assignment when adding an IP address from the prefix view  
						
						 
						
						
						
						
					 
					
						2017-10-09 13:40:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0d9ff907a8 
					 
					
						
						
							
							Merge branch 'develop' of github.com:digitalocean/netbox into develop-2.2  
						
						 
						
						
						
						
					 
					
						2017-09-25 15:12:47 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a328e12642 
					 
					
						
						
							
							Closes   #1536 : Improved formatting of aggregate prefix statistics  
						
						 
						
						
						
						
					 
					
						2017-09-25 12:14:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d651deb31c 
					 
					
						
						
							
							Renamed form_class attribute to model_form for consistency  
						
						 
						
						
						
						
					 
					
						2017-09-12 13:55:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3bb0d523d3 
					 
					
						
						
							
							Enabled services on virtual machines  
						
						 
						
						
						
						
					 
					
						2017-08-31 12:50:35 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0634386b2e 
					 
					
						
						
							
							Merge branch 'develop' into virtualization  
						
						 
						
						
						
						
					 
					
						2017-08-31 10:14:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4b3a425888 
					 
					
						
						
							
							Fixed role link on IP address view  
						
						 
						
						
						
						
					 
					
						2017-08-29 16:14:32 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1308839a41 
					 
					
						
						
							
							Fixes   #1458 : Corrected permission name on prefix/VLAN roles list  
						
						 
						
						
						
						
					 
					
						2017-08-29 15:36:51 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6d849ad5f6 
					 
					
						
						
							
							Deleted obsolete templates  
						
						 
						
						
						
						
					 
					
						2017-08-29 15:31:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fa95191792 
					 
					
						
						
							
							Allowed assigning an IP address to either a device or a VM  
						
						 
						
						
						
						
					 
					
						2017-08-29 15:26:35 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						12d643694f 
					 
					
						
						
							
							Cleaned up title blocks  
						
						 
						
						
						
						
					 
					
						2017-08-02 13:15:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3876a96b67 
					 
					
						
						
							
							Tweaked IP address layout  
						
						 
						
						
						
						
					 
					
						2017-08-02 12:55:21 -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 
							
						 
					 
					
						
						
							
						
						f427c00d94 
					 
					
						
						
							
							Closes   #819 : Implemented IP address functional roles  
						
						 
						
						
						
						
					 
					
						2017-06-14 16:11:13 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						05a796faf1 
					 
					
						
						
							
							Closes   #704 : Allow filtering VLANs by group when editing prefixes  
						
						 
						
						
						
						
					 
					
						2017-06-09 14:15:12 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4f95926cbd 
					 
					
						
						
							
							Added utilization percetange to aggregate and prefix views  
						
						 
						
						
						
						
					 
					
						2017-06-08 12:48:49 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c82658440f 
					 
					
						
						
							
							Converted IPAM import views to new scheme  
						
						 
						
						
						
						
					 
					
						2017-06-02 16:07:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1dd5e2c926 
					 
					
						
						
							
							Fixes   #1229 : Fix validation error on forms where API search is used  
						
						 
						
						
						
						
					 
					
						2017-05-25 14:33:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f9328d53b4 
					 
					
						
						
							
							Fixes   #1197 : Fixed status assignment during bulk import of devices, prefixes, IPs, and VLANs  
						
						 
						
						
						
						
					 
					
						2017-05-17 17:16:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e351ab0171 
					 
					
						
						
							
							Fixes   #1186 : Corrected VLAN edit form so that site assignment is not required  
						
						 
						
						
						
						
					 
					
						2017-05-16 16:30:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						779446da64 
					 
					
						
						
							
							Fixes   #1187 : Fixed table pagination by introducing a custom table template  
						
						 
						
						
						
						
					 
					
						2017-05-16 16:19:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f9b2c59974 
					 
					
						
						
							
							Moved tenancy to separate panel on bulk IP creation form  
						
						 
						
						
						
						
					 
					
						2017-05-12 12:04:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a870a3b918 
					 
					
						
						
							
							Fixes   #1166 : Re-implemented bulk IP address creation  
						
						 
						
						
						
						
					 
					
						2017-05-12 12:00:26 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						473b35f9a3 
					 
					
						
						
							
							Added tenant_group/tenant form section to all objects with tenancy  
						
						 
						
						
						
						
					 
					
						2017-05-11 17:35:20 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5ca87c0f20 
					 
					
						
						
							
							Merge branch 'develop' into v2-develop  
						
						 
						
						
						
						
					 
					
						2017-05-08 15:02:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						79089cc47e 
					 
					
						
						
							
							Introduced an object import template  
						
						 
						
						
						
						
					 
					
						2017-05-03 15:41:36 -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