Merge branch 'develop' into feature/shopping-ui

# Conflicts:
#	cookbook/serializer.py
This commit is contained in:
vabene1111
2024-01-28 11:05:56 +01:00
15 changed files with 61 additions and 27 deletions

View File

@ -303,7 +303,6 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
max_recipes = models.IntegerField(default=0)
max_file_storage_mb = models.IntegerField(default=0, help_text=_('Maximum file storage for space in MB. 0 for unlimited, -1 to disable file upload.'))
max_users = models.IntegerField(default=0)
use_plural = models.BooleanField(default=True)
allow_sharing = models.BooleanField(default=True)
no_sharing_limit = models.BooleanField(default=False)
demo = models.BooleanField(default=False)