Merge branch 'dev' into feature-permissions

This commit is contained in:
Michael Shamoon
2023-01-24 14:10:45 -08:00
49 changed files with 5354 additions and 6219 deletions

View File

@@ -20,7 +20,7 @@ class MailAccountViewSet(ModelViewSet, PassUserMixin):
class MailRuleViewSet(ModelViewSet, PassUserMixin):
model = MailRule
queryset = MailRule.objects.all().order_by("pk")
queryset = MailRule.objects.all().order_by("order")
serializer_class = MailRuleSerializer
pagination_class = StandardPagination
permission_classes = (IsAuthenticated,)