Merge branch 'main' into feature/relational-db

OpenSlides · Apr 19, 2024 · 33f340d · 33f340d
2 parents b6da76d + f3c481a
commit 33f340d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/dev/requirements.txt b/dev/requirements.txt
@@ -1,5 +1,5 @@
 autoflake==2.3.1
-black==24.3.0
+black==24.4.0
 flake8==7.0.0
 isort==5.13.2
 mypy==1.9.0

diff --git a/models.yml b/models.yml
@@ -301,7 +301,7 @@ user:
     restriction_mode: A
   is_active:
     type: boolean
-    restriction_mode: D
+    restriction_mode: B
   is_physical_person:
     type: boolean
     default: true
@@ -1063,6 +1063,10 @@ meeting:
     type: boolean
     default: False
     restriction_mode: B
+  agenda_show_topic_navigation_on_detail_view:
+    type: boolean
+    default: False
+    restriction_mode: B
 
   # List of speakers
   list_of_speakers_amount_last_on_projector:
@@ -1436,6 +1440,15 @@ meeting:
   users_enable_vote_delegations:
     type: boolean
     restriction_mode: B
+  users_forbid_delegator_in_list_of_speakers:
+    type: boolean
+    restriction_mode: B
+  users_forbid_delegator_as_submitter:
+    type: boolean
+    restriction_mode: B
+  users_forbid_delegator_as_supporter:
+    type: boolean
+    restriction_mode: B
 
   # Assignments
   assignments_export_title: