Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						58e4bf1cc3 
					 
					
						
						
							
							Closes   #973 : Removed extraneous admin UI functions  
						
						 
						
						
						
						
					 
					
						2017-03-28 16:41:53 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						116ceb6f93 
					 
					
						
						
							
							Added tests for get-session-key API endpoint  
						
						 
						
						
						
						
					 
					
						2017-03-28 11:30:38 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5d022a575a 
					 
					
						
						
							
							Closes   #985 : Added preserve_key to get-session-key endpoint  
						
						 
						
						
						
						
					 
					
						2017-03-28 11:13:13 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0899a1052e 
					 
					
						
						
							
							Only attempt to process session key if user is authenticated  
						
						 
						
						
						
						
					 
					
						2017-03-22 17:43:29 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						04e09c0078 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/circuits/filters.py 
						
						
					 
					
						2017-03-22 09:48:41 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						05b71564d8 
					 
					
						
						
							
							Closes   #981 : Allow filtering primary objects by a given set of IDs  
						
						 
						
						
						
						
					 
					
						2017-03-22 09:39:30 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6d30fdb83d 
					 
					
						
						
							
							Finished work on secrets views; removed path from cookie assignment  
						
						 
						
						
						
						
					 
					
						2017-03-21 15:30:36 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6cb36a6cee 
					 
					
						
						
							
							Fixed browsable API breadcrumbs  
						
						 
						
						
						
						
					 
					
						2017-03-20 21:50:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						42fd14f5c0 
					 
					
						
						
							
							Introduced HttpStatusMixin to provide more detail on HTTP response status test failures  
						
						 
						
						
						
						
					 
					
						2017-03-20 13:46:47 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						671d53877a 
					 
					
						
						
							
							Python3 fixes  
						
						 
						
						
						
						
					 
					
						2017-03-17 21:39:29 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c08fae8bce 
					 
					
						
						
							
							Restore not-so-extraneous 'id' field to all WritableSerializers  
						
						 
						
						
						
						
					 
					
						2017-03-17 17:32:43 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e544f1fa1e 
					 
					
						
						
							
							Removed extraneous 'id' field from all WritableSerializers  
						
						 
						
						
						
						
					 
					
						2017-03-17 16:20:34 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						130ff27f26 
					 
					
						
						
							
							Wrote tests for secrets API  
						
						 
						
						
						
						
					 
					
						2017-03-17 16:01:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e3ae013e42 
					 
					
						
						
							
							Implemented full read/write support for secrets  
						
						 
						
						
						
						
					 
					
						2017-03-15 14:47:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						07a2b136b8 
					 
					
						
						
							
							Refactored SecretViewSet  
						
						 
						
						
						
						
					 
					
						2017-03-15 13:48:09 -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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						dd27950fae 
					 
					
						
						
							
							Simplify SessionKey usage  
						
						 
						
						
						
						
					 
					
						2017-03-14 10:58:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6c2ed1be22 
					 
					
						
						
							
							Standardized API URL definitions  
						
						 
						
						
						
						
					 
					
						2017-03-09 13:24:02 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						7e6d061646 
					 
					
						
						
							
							Converted GetSessionKey and RSAKeyGeneratorView to ViewSets  
						
						 
						
						
						
						
					 
					
						2017-03-08 17:57:51 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9b39ba169c 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/urls.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py
	netbox/dcim/tables.py
	requirements.txt 
						
						
					 
					
						2017-03-02 16:01:25 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1adae67dd7 
					 
					
						
						
							
							Closes   #927 : Upgrade to django-filter 1.0  
						
						 
						
						
						
						
					 
					
						2017-03-01 13:09:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						616ca4fe1f 
					 
					
						
						
							
							Adapted the web UI to work with the new secrets API  
						
						 
						
						
						
						
					 
					
						2017-02-03 16:14:42 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a42eeb12d2 
					 
					
						
						
							
							Implemented SessionKeys for secrets  
						
						 
						
						
						
						
					 
					
						2017-02-03 12:49:32 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						cf66f67fb6 
					 
					
						
						
							
							Initial work on using session-based master key ciphers  
						
						 
						
						
						
						
					 
					
						2017-02-02 21:26:51 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						2408d78f47 
					 
					
						
						
							
							Introduced ability to decrypt secrets by sending the user's private key in an HTTP header  
						
						 
						
						
						
						
					 
					
						2017-02-01 17:40:50 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4f8a5eb1a0 
					 
					
						
						
							
							Moved secret views into a ViewSet (no write ability yet)  
						
						 
						
						
						
						
					 
					
						2017-02-01 16:21:33 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bb1f97abc2 
					 
					
						
						
							
							Implemented static writable ModelSerializers for all models  
						
						 
						
						
						
						
					 
					
						2017-01-31 15:35:09 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1fcc2b0029 
					 
					
						
						
							
							Namespaced all API URLs  
						
						 
						
						
						
						
					 
					
						2017-01-31 10:40:53 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fa900d5dbb 
					 
					
						
						
							
							Converted nested serializers to HyperlinkedModelSerializer  
						
						 
						
						
						
						
					 
					
						2017-01-27 12:22:29 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						acfba410dd 
					 
					
						
						
							
							Standardized implementation of nested ViewSets  
						
						 
						
						
						
						
					 
					
						2017-01-26 17:58:36 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0f9fe8648e 
					 
					
						
						
							
							Converted static URL definitions to routers  
						
						 
						
						
						
						
					 
					
						2017-01-26 15:34:07 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c5fba24cc5 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						
						
						
					 
					
						2017-01-26 14:07:23 -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 
							
						 
					 
					
						
						
							
						
						062a5bfe8d 
					 
					
						
						
							
							Initial work on API v2.0  
						
						 
						
						
						
						
					 
					
						2017-01-24 17:12:16 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1317c0dd8c 
					 
					
						
						
							
							Closes   #841 : Merged search and filter forms on all object lists  
						
						 
						
						
						
						
					 
					
						2017-01-24 12:05:39 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens L 
							
						 
					 
					
						
						
							
						
						80439c495e 
					 
					
						
						
							
							Basic Support for Python 3 ( #827 )  
						
						 
						
						... 
						
						
						
						* Rudimentary python3 support
* update docs and trigger Travis
* fix some of the tests
* fix all python3 errors
* change env calls to just python
* add @python_2_unicode_compatible decorator to models for python2 compatibility
* switch netbox.configuration to from netbox import configuration 
						
						
					 
					
						2017-01-23 16:44:29 -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 
							
						 
					 
					
						
						
							
						
						28a9307f9f 
					 
					
						
						
							
							Deprecated use_obj_view in favor of get_return_url()  
						
						 
						
						
						
						
					 
					
						2017-01-18 14:34:17 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3eb969de0c 
					 
					
						
						
							
							Standardized the use of return_url for ObjectDeleteView  
						
						 
						
						
						
						
					 
					
						2017-01-18 13:30:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a5fe4468d0 
					 
					
						
						
							
							Upgraded django-filter to 0.15.3  
						
						 
						
						
						
						
					 
					
						2016-12-26 11:58:27 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						37b2ff02e7 
					 
					
						
						
							
							Standardized inheritance order of BootstrapMixin  
						
						 
						
						
						
						
					 
					
						2016-12-21 14:15:18 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5035a9567b 
					 
					
						
						
							
							Fixes   #729 : Corrected cancellation links when editing secondary objects  
						
						 
						
						
						
						
					 
					
						2016-12-08 12:20:45 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a37d2ff4f8 
					 
					
						
						
							
							Closes   #652 : Use password input controls when editing secrets  
						
						 
						
						
						
						
					 
					
						2016-10-31 12:30:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d97dd266b7 
					 
					
						
						
							
							Cleaned up message strings  
						
						 
						
						
						
						
					 
					
						2016-10-31 11:16:30 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fc2ac8a02b 
					 
					
						
						
							
							Attributed all model ValidationErrors to specific fields (where appropriate)  
						
						 
						
						
						
						
					 
					
						2016-10-21 15:39:13 -04:00