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

Fix conflicting amendment projection #2887

Merged

Conversation

bastianjoel
Copy link
Member

resolves #2880

@bastianjoel bastianjoel force-pushed the 2880-fix-motion-amendment-projection branch from 4e9e88c to 75bd1c6 Compare October 12, 2023 13:27
@luisa-beerboom luisa-beerboom removed their assignment Oct 12, 2023
Copy link
Member

@Elblinator Elblinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

function

@Elblinator Elblinator enabled auto-merge (squash) October 23, 2023 06:48
@Elblinator Elblinator merged commit f59c0bf into OpenSlides:main Oct 23, 2023
2 checks passed
@bastianjoel bastianjoel deleted the 2880-fix-motion-amendment-projection branch October 23, 2023 07:33
m-schieder added a commit that referenced this pull request Nov 1, 2023
* commit 'de1c41c440e2769f30db848afed513db289c3dba':
  Add missing field to history subscription (#2915)
  Update projection-edit-dialog to fix bugs (#2891)
  Fix meeting history using wrong user repo (#2889)
  Fix conflicting amendment projection (#2887)
  Add perm check to remove from motion block (#2883)
  Change shown sequential number and add a space (#2881)
  Update global search to show marks bolder (#2879)
  Prevent add ballot if deleted users (#2873)
  Fix autoupdate request flooding after logout (#2907)
  Bump tinymce from 5.10.7 to 5.10.8 in /client (#2920)
  Add tests for the color service (#2928)
  Bump @babel/traverse from 7.21.3 to 7.23.2 in /client (#2910)
  Update angular (#2810)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix projection of motion
3 participants