Merge remote-tracking branch 'upstream/main' into 2170_introduce_gend…

…er_model
OpenSlides · Aug 9, 2024 · 75a0bba · 75a0bba
2 parents 4b39d16 + b281df4
commit 75a0bba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/dev/requirements.txt b/dev/requirements.txt
@@ -2,7 +2,7 @@ autoflake==2.3.1
 black==24.4.2
 flake8==7.1.0
 isort==5.13.2
-mypy==1.10.0
+mypy==1.10.1
 pytest==8.2.2
 pyupgrade==3.16.0
 pyyaml==6.0.1

diff --git a/models.yml b/models.yml
@@ -138,6 +138,9 @@ organization:
     restriction_mode: A
     enum: *languages
     required: true
+  require_duplicate_from:
+    type: boolean
+    restriction_mode: A
 
   # Saml settings
   saml_enabled:
@@ -797,6 +800,9 @@ meeting:
   end_time:
     type: timestamp
     restriction_mode: B
+  locked_from_inside:
+    type: boolean
+    restriction_mode: B
   imported_at:
     type: timestamp
     restriction_mode: B
@@ -2304,23 +2310,19 @@ speaker:
     constant: true
   begin_time:
     type: timestamp
-    read_only: true
     restriction_mode: A
   end_time:
     type: timestamp
-    read_only: true
     restriction_mode: A
   pause_time:
     type: timestamp
     read_only: true
     restriction_mode: A
   unpause_time:
     type: timestamp
-    read_only: true
     restriction_mode: A
   total_pause:
     type: number
-    read_only: true
     restriction_mode: A
   weight:
     type: number