Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						08c492f1f4
					 | 
					
						
						
							
							Merge develop into develop-2.10
						
						
						
						
						
						
					 | 
					
						2020-09-04 16:09:05 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						fd139a77f5
					 | 
					
						
						
							
							Closes #4997: Introduce OrderedDefaultRouter; move root API views to views.py
						
						
						
						
						
						
					 | 
					
						2020-08-13 12:49:49 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						e6bc55af85
					 | 
					
						
						
							
							#4969: Remove user and group assignment from SecretRole
						
						
						
						
						
						
					 | 
					
						2020-08-07 16:19:18 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						aca3ca9d65
					 | 
					
						
						
							
							Simplify the aggregation of constraint sets
						
						
						
						
						
						
					 | 
					
						2020-08-07 14:09:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						4a516103a6
					 | 
					
						
						
							
							Extend ObjectPermission constraints to OR multiple JSON objects
						
						
						
						
						
						
					 | 
					
						2020-08-06 15:53:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						053c600b67
					 | 
					
						
						
							
							Closes #4943: Add a 'description' field to ObjectPermission
						
						
						
						
						
						
					 | 
					
						2020-08-03 16:37:37 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						ce2dada9fd
					 | 
					
						
						
							
							Closes #4942: Make ObjectPermission's 'name' field required
						
						
						
						
						
						
					 | 
					
						2020-08-03 16:10:51 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						ccb2bf4344
					 | 
					
						
						
							
							Exclude permission, userconfig inlines when creating a new user
						
						
						
						
						
						
					 | 
					
						2020-08-03 14:16:21 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						55ee3db5bc
					 | 
					
						
						
							
							#4919: Allow adding/changing assigned permissions within group and user admin views
						
						
						
						
						
						
					 | 
					
						2020-07-29 12:12:00 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						46ebeba28f
					 | 
					
						
						
							
							Set default ordering for user and group API endpoints
						
						
						
						
						
						
					 | 
					
						2020-07-23 13:46:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						cb36f9fdb3
					 | 
					
						
						
							
							Remove restriction enforcement from RestrictedQuerySet
						
						
						
						
						
						
					 | 
					
						2020-07-23 12:48:03 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						380d30e612
					 | 
					
						
						
							
							Add filters for ObjectPermissions
						
						
						
						
						
						
					 | 
					
						2020-07-22 16:34:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						4f54ffa9aa
					 | 
					
						
						
							
							Admin UI cleanup
						
						
						
						
						
						
					 | 
					
						2020-07-22 16:00:28 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						7cdb0cf560
					 | 
					
						
						
							
							Allow the assignment of ObjectPermissions to users, groups, and permissions
						
						
						
						
						
						
					 | 
					
						2020-07-22 15:25:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						79f1248119
					 | 
					
						
						
							
							Add filter tests for group, users
						
						
						
						
						
						
					 | 
					
						2020-07-22 13:58:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						2cc4f032b0
					 | 
					
						
						
							
							Correct FilterSet naming
						
						
						
						
						
						
					 | 
					
						2020-07-22 13:48:04 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						64a3bd37e7
					 | 
					
						
						
							
							Move EXEMPT_EXCLUDE_MODELS to settings; add Group and User models
						
						
						
						
						
						
					 | 
					
						2020-07-22 12:13:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						b4cf85149b
					 | 
					
						
						
							
							Add tests for users and groups API endpoints
						
						
						
						
						
						
					 | 
					
						2020-07-22 12:04:14 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						1ac215bf87
					 | 
					
						
						
							
							Introduce API endpoints for Users and Groups
						
						
						
						
						
						
					 | 
					
						2020-07-22 11:21:51 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						3e6b257fa0
					 | 
					
						
						
							
							Exclude ObjectPermissions API endpoint from EXEMPT_VIEW_PERMISSIONS
						
						
						
						
						
						
					 | 
					
						2020-07-21 17:39:56 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						21a750e8ec
					 | 
					
						
						
							
							Change Postgres-specific JSONField to stock Django field
						
						
						
						
						
						
					 | 
					
						2020-07-16 12:02:49 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						ccdbf820ba
					 | 
					
						
						
							
							Use monospaced font for ObjectPermission constraints
						
						
						
						
						
						
					 | 
					
						2020-07-08 16:07:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						56c0b48302
					 | 
					
						
						
							
							Enable filtering ObjectPermissions by enabled, action, and object type
						
						
						
						
						
						
					 | 
					
						2020-07-08 14:38:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						4c2fdf3b1c
					 | 
					
						
						
							
							Admin UI should use unrestricted queryset for ObjectPermissions
						
						
						
						
						
						
					 | 
					
						2020-07-08 13:59:57 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						4eddec4b1e
					 | 
					
						
						
							
							#4806: Add url field to ObjectPermissionSerializer
						
						
						
						
						
						
					 | 
					
						2020-07-08 13:57:50 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						39248f9e2f
					 | 
					
						
						
							
							Enable bulk enabling/disabling of permissions
						
						
						
						
						
						
					 | 
					
						2020-07-08 13:54:09 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						fac0da224a
					 | 
					
						
						
							
							Add name, enabled fields to ObjectPermission
						
						
						
						
						
						
					 | 
					
						2020-07-08 13:44:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						2c354c7f86
					 | 
					
						
						
							
							Fix automatic creation of UserConfig for user created via admin UI
						
						
						
						
						
						
					 | 
					
						2020-06-26 14:29:24 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						328d639886
					 | 
					
						
						
							
							Merge branch 'develop' into develop-2.9
						
						
						
						
						
						
					 | 
					
						2020-06-17 16:57:17 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						e23a5ad141
					 | 
					
						
						
							
							Fixes #4766: Fix redirect after login when next is not specified
						
						
						
						
						
						
					 | 
					
						2020-06-17 09:15:03 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						987414ed7b
					 | 
					
						
						
							
							Introduce NestedObjectPermissionSerializer
						
						
						
						
						
						
					 | 
					
						2020-06-08 15:44:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						62224857f0
					 | 
					
						
						
							
							Standardize ObjectPermissionTest
						
						
						
						
						
						
					 | 
					
						2020-06-08 14:01:15 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						3084d58da1
					 | 
					
						
						
							
							Add REST API endpoint for ObjectPermissions
						
						
						
						
						
						
					 | 
					
						2020-06-03 13:08:04 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						d157818d7e
					 | 
					
						
						
							
							Rename attrs to constraints
						
						
						
						
						
						
					 | 
					
						2020-06-03 09:43:46 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						ddcd172af1
					 | 
					
						
						
							
							Rename content_types to object_types
						
						
						
						
						
						
					 | 
					
						2020-06-03 09:27:20 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						3502398d1d
					 | 
					
						
						
							
							Remove delete_token permission from TokenDeleteView
						
						
						
						
						
						
					 | 
					
						2020-06-02 15:36:31 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						a62b98ac50
					 | 
					
						
						
							
							Admin UI improvements
						
						
						
						
						
						
					 | 
					
						2020-06-02 13:21:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						7a7634de2d
					 | 
					
						
						
							
							Accomodate custom legacy permission in schema migration
						
						
						
						
						
						
					 | 
					
						2020-06-02 10:50:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						c6e85970d4
					 | 
					
						
						
							
							Remove activate_userkey permission
						
						
						
						
						
						
					 | 
					
						2020-06-02 09:51:56 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						5d4cc5bf3d
					 | 
					
						
						
							
							Fix ordering of group and user fields in ObjectPermission admin
						
						
						
						
						
						
					 | 
					
						2020-06-01 13:59:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						8786bb25c5
					 | 
					
						
						
							
							Fix instance evaluation
						
						
						
						
						
						
					 | 
					
						2020-05-29 13:57:38 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						670139492d
					 | 
					
						
						
							
							Fix permission action evaluation
						
						
						
						
						
						
					 | 
					
						2020-05-29 13:47:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						5d3cf8074b
					 | 
					
						
						
							
							Add migration for replicating legact permissions to ObjectPermissions
						
						
						
						
						
						
					 | 
					
						2020-05-29 13:42:38 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						85c54703ec
					 | 
					
						
						
							
							Improve the admin form for ObjectPermissions
						
						
						
						
						
						
					 | 
					
						2020-05-29 12:08:51 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						02687453f2
					 | 
					
						
						
							
							Add ArrayField on ObjectPermission to store actions
						
						
						
						
						
						
					 | 
					
						2020-05-29 11:25:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						90828cedae
					 | 
					
						
						
							
							Introduce proxy models for User and Group to organize admin UI
						
						
						
						
						
						
					 | 
					
						2020-05-29 10:43:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						f65b2278f0
					 | 
					
						
						
							
							Enable many-to-many model assignment for ObjectPermissions
						
						
						
						
						
						
					 | 
					
						2020-05-28 15:04:46 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						bdfc0364d5
					 | 
					
						
						
							
							Fix up ObjectPermission content type assignment
						
						
						
						
						
						
					 | 
					
						2020-05-28 14:20:18 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						65bd3fbddb
					 | 
					
						
						
							
							Remove built-in permission assignment from admin UI
						
						
						
						
						
						
					 | 
					
						2020-05-28 14:03:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						f8e29ea66a
					 | 
					
						
						
							
							Remove ObjectPermissionManager
						
						
						
						
						
						
					 | 
					
						2020-05-28 13:47:52 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |