Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6813787fc7 
					 
					
						
						
							
							Fixes   #1013 : Show edit/delete reservation buttons on rack view  
						
						 
						
						
						
						
					 
					
						2017-03-29 12:15:14 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						afdb24610d 
					 
					
						
						
							
							Initial work on global search  
						
						 
						
						
						
						
					 
					
						2017-03-29 12:04:57 -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 
							
						 
					 
					
						
						
							
						
						47120fae01 
					 
					
						
						
							
							Rack assignment is optional for devices  
						
						 
						
						
						
						
					 
					
						2017-03-23 15:36:24 -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 
							
						 
					 
					
						
						
							
						
						a5419ecc5c 
					 
					
						
						
							
							RPC API fixes  
						
						 
						
						
						
						
					 
					
						2017-03-21 17:24:16 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						93c748bd3c 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						
						
						
					 
					
						2017-03-21 14:10:53 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						22768ff6c6 
					 
					
						
						
							
							Renamed Module to InventoryItem (prep for  #824 )  
						
						 
						
						
						
						
					 
					
						2017-03-21 12:54:08 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1682de59df 
					 
					
						
						
							
							Added a footer link to the GitHub wiki  
						
						 
						
						
						
						
					 
					
						2017-03-20 14:05:26 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3dc15068b9 
					 
					
						
						
							
							Allow user to delete session key  
						
						 
						
						
						
						
					 
					
						2017-03-14 14:01:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4cb30f1ce4 
					 
					
						
						
							
							Relate SessionKey to UserKey rather than User  
						
						 
						
						
						
						
					 
					
						2017-03-14 13:32:07 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b868de8d67 
					 
					
						
						
							
							Updated user URLs  
						
						 
						
						
						
						
					 
					
						2017-03-14 12:59:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						04aedcc056 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/templates/users/_user.html
	netbox/users/urls.py 
						
						
					 
					
						2017-03-14 12:40:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d9f1bcbf15 
					 
					
						
						
							
							Renamed user URL namespace  
						
						 
						
						
						
						
					 
					
						2017-03-14 12:36:44 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						105d17748e 
					 
					
						
						
							
							Secrets UI work  
						
						 
						
						
						
						
					 
					
						2017-03-14 12:32:08 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						cd97b2fb96 
					 
					
						
						
							
							Fix parent device position display  
						
						 
						
						
						
						
					 
					
						2017-03-13 11:25:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						68c099a2af 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/netbox/settings.py 
						
						
					 
					
						2017-03-08 15:18:32 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4f6d2a8b71 
					 
					
						
						
							
							Finished user control panel for tokens  
						
						 
						
						
						
						
					 
					
						2017-03-08 11:34:47 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d58a8ebba0 
					 
					
						
						
							
							Initial work on user control panel for tokens  
						
						 
						
						
						
						
					 
					
						2017-03-07 23:30:53 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4e766c7c3b 
					 
					
						
						
							
							Closes   #945 : Display the current user in the nav menu  
						
						 
						
						
						
						
					 
					
						2017-03-07 22:27:46 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						02e89d77bb 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/dcim/api/views.py 
						
						
					 
					
						2017-03-07 14:08:06 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						03d3bbcddb 
					 
					
						
						
							
							Fixes   #938 : Provider view yields an error if one or more circuits is assigned to a tenant  
						
						 
						
						
						
						
					 
					
						2017-03-03 10:47:16 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c0152940f9 
					 
					
						
						
							
							Merged develop  
						
						 
						
						
						
						
					 
					
						2017-02-28 16:10:53 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9313ba08ed 
					 
					
						
						
							
							Implemented recursive regions with django-mptt  
						
						 
						
						
						
						
					 
					
						2017-02-28 14:15:15 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f3b9930dea 
					 
					
						
						
							
							Initial work on regions  
						
						 
						
						
						
						
					 
					
						2017-02-28 12:11:43 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5520144ff4 
					 
					
						
						
							
							Fixed permissions for inclusion of interface bulk edit form  
						
						 
						
						
						
						
					 
					
						2017-02-27 17:19:30 -05: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 
							
						 
					 
					
						
						
							
						
						b0f9035e2d 
					 
					
						
						
							
							Additional work on  #904  
						
						 
						
						
						
						
					 
					
						2017-02-21 14:53:22 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shawn Peng 
							
						 
					 
					
						
						
							
						
						aba9748ffd 
					 
					
						
						
							
							Fix   #235 : Enable global vlan ( #904 )  
						
						 
						
						... 
						
						
						
						* Fix  #235 : Enable global vlan
Decouple site/vlan, make site optional for vlan/vlangroup
Change html generation code to check site existence before
dereference
Create site search function, if site is None for a VLAN, view it as
global VLAN
* commit1
* commit2
* commit3
* Add migration file for VLAN&VLAN group
* Revert unintentional commits 
						
						
					 
					
						2017-02-21 13:27:24 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f1518226bd 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/dcim/api/serializers.py 
						
						
					 
					
						2017-02-17 15:12:53 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4d26fc7e7c 
					 
					
						
						
							
							Fixes   #903 : Only alert on missing criticial connections if present in the parent device type  
						
						 
						
						
						
						
					 
					
						2017-02-17 15:10:08 -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 
							
						 
					 
					
						
						
							
						
						e8896fe238 
					 
					
						
						
							
							Closes   #898 : Expand circuits list in provider view  
						
						 
						
						
						
						
					 
					
						2017-02-16 15:13:35 -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 
							
						 
					 
					
						
						
							
						
						616ca4fe1f 
					 
					
						
						
							
							Adapted the web UI to work with the new secrets API  
						
						 
						
						
						
						
					 
					
						2017-02-03 16:14:42 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f52c247bd5 
					 
					
						
						
							
							Re-implemented Swagger now that URL resolution has been fixed  
						
						 
						
						
						
						
					 
					
						2017-02-01 12:37:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0dd857f7a2 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						
						
						
					 
					
						2017-02-01 12:33:37 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f4f41a5985 
					 
					
						
						
							
							Fixes   #859 : Fix Javascript for connection status toggle button  
						
						 
						
						
						
						
					 
					
						2017-01-31 09:41:25 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b31c097531 
					 
					
						
						
							
							Removed Swagger  
						
						 
						
						
						
						
					 
					
						2017-01-26 15:36:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5d5d4ac714 
					 
					
						
						
							
							Fixes   #845 : Fix missing edit/delete buttons on object tables for non-superusers  
						
						 
						
						
						
						
					 
					
						2017-01-26 13:20:56 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1317c0dd8c 
					 
					
						
						
							
							Closes   #841 : Merged search and filter forms on all object lists  
						
						 
						
						
						
						
					 
					
						2017-01-24 12:05:39 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bbc633b004 
					 
					
						
						
							
							Closes   #782 : Allow filtering devices list by manufacturer  
						
						 
						
						
						
						
					 
					
						2017-01-24 10:53:59 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ed8fdd9292 
					 
					
						
						
							
							Fixes   #816 : Redirect back to parent prefix view after deleting child prefixes  
						
						 
						
						
						
						
					 
					
						2017-01-24 09:50:51 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1bddd038fe 
					 
					
						
						
							
							Fixes   #840 : Correct API path resolution for secrets when BASE_PATH is configured  
						
						 
						
						
						
						
					 
					
						2017-01-23 16:25:05 -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