Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'main' into feature/relational-db #86

Merged
merged 15 commits into from
Apr 19, 2024
Merged

Merge branch 'main' into feature/relational-db #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cb3fd41
Add new settings concerning delegator rights
luisa-beerboom Apr 8, 2024
5441012
rename
luisa-beerboom Apr 8, 2024
1e309a2
Fix close issues
jsangmeister Apr 9, 2024
48c3908
Merge pull request #78 from jsangmeister/fix-close-issues
jsangmeister Apr 9, 2024
ad56620
Add new setting for topic navigation
reiterl Apr 10, 2024
0ed05cd
Merge remote-tracking branch 'upstream/main' into 2348-new-delegator-…
luisa-beerboom Apr 10, 2024
b78abfb
Merge pull request #72 from luisa-beerboom/2348-new-delegator-rights-…
luisa-beerboom Apr 10, 2024
b17fe59
Bump black from 24.3.0 to 24.4.0 in /dev
dependabot[bot] Apr 12, 2024
31a0faf
Fixed restiriction mode for user is_active.
rrenkert Apr 15, 2024
427c1f8
Merge pull request #81 from OpenSlides/dependabot/pip/dev/black-24.4.0
jsangmeister Apr 16, 2024
e28d699
Merge branch 'main' into fix-restiriction-user-isactive
rrenkert Apr 16, 2024
2b91e73
Merge pull request #82 from rrenkert/fix-restiriction-user-isactive
m-schieder Apr 16, 2024
83d1250
Merge branch 'main' into new-setting-for-topic-navigation
reiterl Apr 18, 2024
f3c481a
Merge pull request #79 from reiterl/new-setting-for-topic-navigation
reiterl Apr 18, 2024
33f340d
Merge branch 'main' into feature/relational-db
jsangmeister Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 14 additions & 1 deletion models.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down