Jeremy Stretch 08c492f1f4 Merge develop into develop-2.10

2020-09-04 16:09:05 -04:00

..

api

Closes #4997: Introduce OrderedDefaultRouter; move root API views to views.py

2020-08-13 12:49:49 -04:00

migrations

#4969: Remove user and group assignment from SecretRole

2020-08-07 16:19:18 -04:00

tests

Closes #4943: Add a 'description' field to ObjectPermission

2020-08-03 16:37:37 -04:00

__init__.py

…

admin.py

Extend ObjectPermission constraints to OR multiple JSON objects

2020-08-06 15:53:23 -04:00

filters.py

Add filters for ObjectPermissions

2020-07-22 16:34:16 -04:00

forms.py

…

models.py

Simplify the aggregation of constraint sets

2020-08-07 14:09:55 -04:00

urls.py

Add page for user to view/clear preferences

2020-04-24 10:29:06 -04:00

views.py

Merge develop into develop-2.10

2020-09-04 16:09:05 -04:00