Merge branch 'main' into feature/relational-db

OpenSlides · Jun 6, 2024 · 41c2e71 · 41c2e71
2 parents 59b4f26 + 8bebca6
commit 41c2e71
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/dev/requirements.txt b/dev/requirements.txt
@@ -3,7 +3,7 @@ black==24.4.2
 flake8==7.0.0
 isort==5.13.2
 mypy==1.10.0
-pytest==8.2.1
+pytest==8.2.2
 pyupgrade==3.15.2
 pyyaml==6.0.1
 simplejson==3.19.2

diff --git a/models.yml b/models.yml
@@ -4077,10 +4077,18 @@ projector:
     type: color
     default: "#317796"
     restriction_mode: A
+  chyron_background_color_2:
+    type: color
+    default: "#134768"
+    restriction_mode: A
   chyron_font_color:
     type: color
     default: "#ffffff"
     restriction_mode: A
+  chyron_font_color_2:
+    type: color
+    default: "#ffffff"
+    restriction_mode: A
   show_header_footer:
     type: boolean
     default: true

diff --git a/search.yml b/search.yml
@@ -256,6 +256,7 @@ user:
     - organization_management_level
     - meeting_ids
     - owner_id
+    - member_number
   searchable_config:
     first_name:
       analyzer: simple