Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						22ed4f1b53
					 | 
					
						
						
							
							Merge release v2.4.6
						
						
						
						
						
						
					 | 
					
						2018-10-10 09:36:51 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						5d10d8418e
					 | 
					
						
						
							
							Closes #2479: Add user permissions for creating/modifying API tokens
						
						
						
						
						
						
					 | 
					
						2018-10-05 11:06:59 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						5f66710fcd
					 | 
					
						
						
							
							Closes #2292: Remove the deprecated UserAction model
						
						
						
						
						
						
					 | 
					
						2018-08-14 12:13:43 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						25ee796d5b
					 | 
					
						
						
							
							Include instructions when displaying an inactive user key
						
						
						
						
						
						
					 | 
					
						2017-07-05 10:51:25 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						3ed3e93b25
					 | 
					
						
						
							
							Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade
						
						
						
						
						
						
					 | 
					
						2017-03-30 15:40:00 -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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						eab18a81c9
					 | 
					
						
						
							
							Adjusted display of created and last_updated times for primary objects
						
						
						
						
						
						
					 | 
					
						2016-08-19 12:19:02 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						1fd189f9b1
					 | 
					
						
						
							
							Replaced most glyphicons with Font Awesome
						
						
						
						
						
						
					 | 
					
						2016-08-01 13:29:45 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						9de8ac91a1
					 | 
					
						
						
							
							Fixed typo
						
						
						
						
						
						
					 | 
					
						2016-06-24 10:54:05 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						8563e2aca3
					 | 
					
						
						
							
							Standardized date/time displays; moved format declarations to configuration.py
						
						
						
						
						
						
					 | 
					
						2016-06-22 13:22:59 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						ed07b235a2
					 | 
					
						
						
							
							Pulled in all third-party resources and standardized on static template tag
						
						
						
						
						
						
					 | 
					
						2016-06-21 13:26:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						651f97af81
					 | 
					
						
						
							
							Improved UserAction display
						
						
						
						
						
						
					 | 
					
						2016-05-24 09:45:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						27b289ee3b
					 | 
					
						
						
							
							Initial push to public repo
						
						
						
						
						
						
					 | 
					
						2016-03-01 11:23:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |