Sander Steffann
							
						 
					 | 
					
						
						
							
						
						7f779e3942
					 | 
					
						
						
							
							Hide password change page when user is logged in using LDAP
						
						
						
						
						
						
					 | 
					
						2019-11-03 16:05:53 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						5f66710fcd
					 | 
					
						
						
							
							Closes #2292: Remove the deprecated UserAction model
						
						
						
						
						
						
					 | 
					
						2018-08-14 12:13:43 -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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						298ac1ba7a
					 | 
					
						
						
							
							Widened page layout; improved mobile rendering
						
						
						
						
						
						
					 | 
					
						2016-12-09 16:23:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |