Commit Graph

153 Commits

Author SHA1 Message Date
Emanuel Schütze d86fcd80b7
Merge pull request #6031 from jsangmeister/fix-entitled-users
Fix entitled user calculation and display of voting banner in case of vote delegations
2021-04-29 15:38:49 +02:00
Finn Stutzenstein 75bd3c50e5
Fix LOS (closes #6035) 2021-04-29 13:46:36 +02:00
Emanuel Schütze 22df847c78 Updated translations 2021-04-27 23:05:23 +02:00
Emanuel Schütze 672e5ca544
Merge pull request #6017 from FinnStutzenstein/samlGroups
Adding attribute matchers for group assignments to SAML
2021-04-27 21:30:38 +02:00
Emanuel Schütze 9f543697ad
Merge pull request #6023 from FinnStutzenstein/proContraNoteMarkSpeakers
pro/contra speakers and notes for point of order speakers
2021-04-27 20:45:02 +02:00
Finn Stutzenstein c9c90cd4a3 pro/contra speakers and notes for point of order speakers
Enhance Pro Contra UI/UX by Sean
2021-04-27 19:53:17 +02:00
Joshua Sangmeister 8ad008d9de Fix entitled user calculation and display of voting banner in case of vote delegations 2021-04-26 15:44:42 +02:00
Finn Stutzenstein f9d19db9e2
Update black 2021-04-26 09:00:04 +02:00
Emanuel Schütze 7315626e18
Merge pull request #6024 from jsangmeister/vote-delegaton-error
Fix vote delegation update error
2021-04-22 21:10:30 +02:00
Joshua Sangmeister e2d4fafe6d Fix vote delegation update error 2021-04-22 20:51:44 +02:00
Finn Stutzenstein 0a2483a94b
Adding attribute matchers for group assignments to SAML 2021-04-22 14:53:26 +02:00
Finn Stutzenstein a8e329253c
Validate the from email for invalid characters
This might not be sufficient for all cases. If some other strange
IndexErrors appear, more validation has to be done. For now, it catches
all observed cases.
2021-04-22 12:33:33 +02:00
Joshua Sangmeister ee31c1e633 Lock poll to prevent race conditions
Add migrations
2021-04-15 15:19:30 +02:00
Finn Stutzenstein e3c627b504
Update dependencies
Update DRF to resolve https://github.com/advisories/GHSA-fx83-3ph3-9j2q

-> https://www.django-rest-framework.org/community/3.9-announcement/
replaces `list_route` and `detail_route`

Update autoupdate submodule
2021-04-12 13:36:46 +02:00
Emanuel Schütze 963986b91d
Merge pull request #6004 from FinnStutzenstein/smallFixes
Small fixes
2021-04-12 12:14:17 +02:00
Finn Stutzenstein 2b3d1db3bf
Merge pull request #5952 from Piratenpartei/server_setup_env
Add ENV for server-setup host and port
2021-04-12 08:04:58 +02:00
Finn Stutzenstein a1e7920b34
Small fixes 2021-04-12 07:52:47 +02:00
Emanuel Schütze d80919f0e7
Merge pull request #6001 from jsangmeister/fix-recommendation-extension-bug
Recommendation extension can be set with can_manage_metadata
2021-04-08 18:30:08 +02:00
Joshua Sangmeister 8891a52bdc State and recommendation extension can be set with can_manage_metadata 2021-04-08 17:47:11 +02:00
Joshua Sangmeister 1e6b042d71 Add migrations to remove duplicates from existing polls 2021-04-08 11:33:26 +02:00
Joshua Sangmeister f54050a83c Prevent multiple entries in entitled_users_at_stop 2021-04-08 11:12:13 +02:00
Finn Stutzenstein a94f00672b
Merge pull request #5996 from FinnStutzenstein/fixDeps
Locked mypy, added new OS4 files to gitignore
2021-04-08 10:51:05 +02:00
Finn Stutzenstein 7ca761bdb0
Locked mypy, added new OS4 files to gitignore 2021-04-08 09:01:02 +02:00
jsangmeister 787390c899
Merge pull request #5978 from jsangmeister/voting-changes
Implement voting changes
2021-04-01 16:12:31 +02:00
Joshua Sangmeister 4b13ff681e user_token, single votes table, entitled_users server changes
server changes finished, tests, cleanup

Add entitled user table

Fix formatting

Finish entitled users table & implement new percent base

Fix typing

Fixed remarks & errors

Fix new precent base representation

Update autoupdate service

Remove unneeded prettier entry

Remove unneeded css
2021-04-01 16:02:47 +02:00
Adrian Nöthlich 6430727590
Use ENV for redis in db-setup and fix defaults (#5951)
* Use ENV for redis in db-setup and fix defaults

* Add default value for `DATABASE_HOST`
* Use ENV for `wait-for-it` redis and redis-slave

Signed-off-by: Adrian Nöthlich <git@promasu.tech>

* Match default value for DATABASE_HOST
2021-04-01 13:10:19 +02:00
Emanuel Schütze c9b924d79a
Merge pull request #5976 from FinnStutzenstein/fixListOfSpeakerInitialClosed
Fix LOS initially closed migration issue
2021-03-22 20:48:47 +01:00
Finn Stutzenstein f897bb01a3
Enable pytest in docker
The DJANGO_SETTINGS_MODULE is set in the develop container, so the
tests.settings from the setup.cfg was ignored. Executing pytest with

    DJANGO_SETTINGS_MODULE=tests.settings pytest

works fine. The line added in the setup.cfg takes over precedence: It
auto-adds the --ds parameter which has a higher precedence than the
environment variable.

Also removed an unnecessary setting.
2021-03-22 13:01:26 +01:00
Finn Stutzenstein 41a3447357
Fix LOS initially closed migration issue 2021-03-22 08:54:16 +01:00
Emanuel Schütze bd29777d83 Updated translations 2021-03-19 14:20:15 +01:00
Finn Stutzenstein a48fe86791
Add login errors for inactive users 2021-03-19 07:35:45 +01:00
Finn Stutzenstein e45d83de5a
Small mediafile fixes 2021-03-18 15:21:00 +01:00
Finn Stutzenstein 365d0d55ea
Merge pull request #5937 from FinnStutzenstein/deleteUnusedCode
Delete unused code
2021-03-15 14:52:04 +01:00
Adrian Nöthlich 52108cd0c4
Add ENV for server-setup host and port
Signed-off-by: Adrian Nöthlich <git@promasu.tech>
2021-03-12 01:07:39 +01:00
Martin Dickopp a9d223121e Make configurable whether a newly created list of speakers is initially open or closed 2021-03-08 16:28:00 +01:00
Finn Stutzenstein 3ba4f99876
Delete unused code
@oscar: Only the user restricter is still present in the code since it is needed for whoami
2021-03-08 08:57:21 +01:00
Emanuel Schütze bd7fa9b3db
Merge pull request #5935 from FinnStutzenstein/userAutoupdateOnPermissionChange
Update users on can_see_extra_data permission change
2021-03-04 21:23:04 +01:00
Finn Stutzenstein 265145f001
Merge pull request #5936 from FinnStutzenstein/redisTimeoutErrors
Attempt on handling timeout errors
2021-03-04 09:09:38 +01:00
Finn Stutzenstein 39fb2fadec
Attempt on handling timeout errors
This code retries to load sessions three times. If not an error will be
thrown. There are other solutions (Like not throwing the error), but
I would like to see errors in production usage to see, if this helps or
not.
2021-03-04 08:45:45 +01:00
Finn Stutzenstein d0c1879521
Update users on can_see_extra_data permission change 2021-03-04 08:20:05 +01:00
Finn Stutzenstein 93da435e7c
Remove voted_id for ongoing polls 2021-03-04 07:56:11 +01:00
Finn Stutzenstein 3504a87295 Update Dependencies 2021-03-02 22:53:48 +01:00
Emanuel Schütze 83ff7b938c
Merge pull request #5927 from FinnStutzenstein/pointOfOrderOnlyCanSpeak
Point of order only for agenda.can_be_speaker
2021-03-01 16:12:44 +01:00
Emanuel Schütze 4e6f0850c4 Fixed showSubtitle config. Reordered agenda config. 2021-03-01 15:21:43 +01:00
Finn Stutzenstein a9045b6a1c
Point of order only for agenda.can_be_speaker 2021-03-01 14:31:40 +01:00
Finn Stutzenstein f8446ee609
Fix point of order weighting 2021-02-22 13:33:36 +01:00
Finn Stutzenstein 4929e2b6f6 Change chat access groups
Adjust some client chat feature

- Cleanup some stuff
- Read and write chatting
2021-02-19 15:08:02 +01:00
Finn Stutzenstein fe0f8d28f4
Remove debug prints 2021-02-15 11:32:24 +01:00
Finn Stutzenstein 35e8f84fda
Own session redis
- removed big mode artifacts
- removed django_session_redis
- Enforce newly created settings.py when invalid options are set:
  * OPENSLIDES_USER_DATA_DIR
  * SESSION_ENGINE
- Overwrites the secret key during development to "development"
2021-02-15 07:37:46 +01:00
Finn Stutzenstein e9c2dc90d5
Catch pyPDF2 key error 2021-02-15 07:22:38 +01:00