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.

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 main branch into feature/vote decrypt branch #2491

Merged

Conversation

r-peschke
Copy link
Member

No description provided.

luisa-beerboom and others added 15 commits June 4, 2024 14:09
…OpenSlides#2460)

* Write tests

* Fix faulty recognition of empty-string names and email in user import

* Fix other test cases
* New chyron color fields in projector

* Fix example data, add migration

* Migration indices on example and initial data

* Adress tests

* Edit comment
* Add option to project without side effects

* Fix black

* Rename option, add test

* Fix test
Co-authored-by: Elblinator <69210919+Elblinator@users.noreply.github.com>
…2468)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.1 to 8.2.2.
- [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.2.1...8.2.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: r-peschke <26029109+r-peschke@users.noreply.github.com>
)

* Removed member_number name generation from user imports

* cleanup

* Don't generate username if there are no names
…ides#2480)

Bumps [pyupgrade](https://github.com/asottile/pyupgrade) from 3.15.2 to 3.16.0.
- [Commits](asottile/pyupgrade@v3.15.2...v3.16.0)

---
updated-dependencies:
- dependency-name: pyupgrade
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: r-peschke <26029109+r-peschke@users.noreply.github.com>
* Little hacky to reduce locked_fields without loss of performance

* commit changed .gitmodules

* remove global/meta1

* commit reformatted
…2483)

Bumps [flake8](https://github.com/pycqa/flake8) from 7.0.0 to 7.1.0.
- [Commits](PyCQA/flake8@7.0.0...7.1.0)

---
updated-dependencies:
- dependency-name: flake8
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: r-peschke <26029109+r-peschke@users.noreply.github.com>
…penSlides#2484)

* Bump fastjsonschema from 2.19.1 to 2.20.0 in /requirements/partial

Bumps [fastjsonschema](https://github.com/horejsek/python-fastjsonschema) from 2.19.1 to 2.20.0.
- [Changelog](https://github.com/horejsek/python-fastjsonschema/blob/master/CHANGELOG.txt)
- [Commits](horejsek/python-fastjsonschema@v2.19.1...v2.20.0)

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

Signed-off-by: dependabot[bot] <support@github.com>

* refresh datastore and auth-service commit hash

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ralf Peschke <ralf.peschke@intevation.de>
@r-peschke r-peschke self-assigned this Jun 24, 2024
@r-peschke r-peschke merged commit 5b9792c into OpenSlides:feature/vote-decrypt Jun 24, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants