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

Jump to bottom

merge main into feature/relational db #98

Merged
merged 12 commits into from
May 6, 2024
Merged

merge main into feature/relational db #98

merged 12 commits into from
May 6, 2024

Commits on Apr 26, 2024

  1. change restriction_mode from organization_managment_level to B

    @Elblinator
    Elblinator committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    95cb1bf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into new_restriction_for_managment_level

    @Elblinator
    Elblinator authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    9c9151f View commit details
    Browse the repository at this point in the history

  3. Merge pull request OpenSlides#91 from Elblinator/new_restriction_for_… 

    …managment_level
    @Elblinator
    Elblinator authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    270de75 View commit details
    Browse the repository at this point in the history

  4. Add setting to forbid delegator from voting

    @jsangmeister
    jsangmeister committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a1c9a7e View commit details
    Browse the repository at this point in the history

  5. Merge pull request OpenSlides#93 from jsangmeister/vote-delegation-se… 

    …tting

Add setting to forbid delegator from voting
    @jsangmeister
    jsangmeister authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ea10c6c View commit details
    Browse the repository at this point in the history

  6. Add action for cherry-picking staging changes 

    Also extend Update meta actions to work on staging branch.
    @peb-adr
    peb-adr committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d131575 View commit details
    Browse the repository at this point in the history

  7. Merge pull request OpenSlides#94 from peb-adr/staging-actions 

    Add action for cherry-picking staging changes
    @rrenkert
    rrenkert authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7177fe3 View commit details
    Browse the repository at this point in the history

  8. Bump black from 24.4.1 to 24.4.2 in /dev 

    Bumps [black](https://github.com/psf/black) from 24.4.1 to 24.4.2.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](psf/black@24.4.1...24.4.2)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d9479e3 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Merge pull request OpenSlides#95 from OpenSlides/dependabot/pip/dev/b… 

    …lack-24.4.2

Bump black from 24.4.1 to 24.4.2 in /dev
    @r-peschke
    r-peschke authored May 6, 2024
    Configuration menu
    Copy the full SHA
    6529e09 View commit details
    Browse the repository at this point in the history

  2. Bump pytest from 8.1.1 to 8.2.0 in /dev 

    Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored May 6, 2024
    Configuration menu
    Copy the full SHA
    f810524 View commit details
    Browse the repository at this point in the history

  3. Merge pull request OpenSlides#97 from OpenSlides/dependabot/pip/dev/p… 

    …ytest-8.2.0

Bump pytest from 8.1.1 to 8.2.0 in /dev
    @r-peschke
    r-peschke authored May 6, 2024
    Configuration menu
    Copy the full SHA
    9999cca View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feature/relational-db

    Ralf Peschke committed May 6, 2024
    Configuration menu
    Copy the full SHA
    dc13061 View commit details
    Browse the repository at this point in the history