Commit Graph

186 Commits

Author SHA1 Message Date
Finn Stutzenstein
ea180246c7
fixed server, rebased on current master 2021-01-12 09:50:13 +01:00
Sean
0b01b5576b
Fixing min amounts in assignment meta info 2021-01-12 09:29:28 +01:00
Finn Stutzenstein
7e763e8c07
Minumum amount of votes
renamed votes_amount to max_votes_amount
2021-01-12 09:29:24 +01:00
Finn Stutzenstein
b0ba30b454
Fix vote_delegated_from_user_ids on user update 2021-01-08 08:24:34 +01:00
Emanuel Schütze
ef135837f7 Update version to 3.4-master 2020-12-18 00:43:02 +01:00
Emanuel Schütze
a37e2196b3 Release 3.3 2020-12-18 00:43:02 +01:00
Emanuel Schütze
273debf99a Readded setup.py 2020-12-18 00:42:59 +01:00
Emanuel Schütze
227dfd0c26 Updated translations 2020-12-17 10:30:46 +01:00
Emanuel Schütze
0a80a73f2e
Merge pull request #5761 from jwinzer/poll-progress-users
Fix user filter of poll progress
2020-12-13 20:52:50 +01:00
Finn Stutzenstein
ef42a2293d
Adjust restricter, so poll managers can see the delegation structure 2020-12-10 09:20:50 +01:00
Finn Stutzenstein
78f0b29921
Disallows users, who have delegated their votes to others, to selfvote. It is enforced, that the user who gets the vote right must vote for the right-provder. 2020-12-04 06:52:25 +01:00
Sean
d0ed5448e8 Add poster image in 404 cases
Shows the assigned poster image if the stream is not
reachable
2020-12-03 12:09:30 +01:00
Finn Stutzenstein
652b727386
Merge pull request #5738 from FinnStutzenstein/fixGetWhoAmIError
Fix error handling in WhoAmI data view
2020-11-30 13:44:29 +01:00
Finn Stutzenstein
e1183fff60
Fix error handling in WhoAmI data view 2020-11-30 13:00:03 +01:00
Emanuel Schütze
ad907de958 Updated translations 2020-11-26 12:20:21 +01:00
Emanuel Schütze
8b94829a2c
Merge pull request #5695 from tsiegleauq/active-wait-for-perms
Show "please grant mic access" info
2020-11-26 12:06:27 +01:00
Sean
26ac618ddf Show "please grant mic access" info
If the browser does not have the permission to use the microphone,
OpenSlides will show a spinner to inform the user to grant
mic access
2020-11-25 15:49:18 +01:00
Emanuel Schütze
c323eabd6f
Merge pull request #5727 from FinnStutzenstein/enableIsPresentBulkForSAMLUsers
Enable bulk set presence for non-default auth type users
2020-11-25 15:30:13 +01:00
Sean
a51103b7b7
Merge pull request #5707 from tsiegleauq/automatically-join-jitsi
Autoconnect the next X speaker to jitsi
2020-11-25 15:29:24 +01:00
Sean
d6467d5bbf Autoconnect the next X speaker to jitsi
In config, set "general_system_conference_auto_connect_next_speakers"
to let the next X speakers on the current list of speakers
automatically join the jitsi conference.
Updates automatically
2020-11-25 15:13:02 +01:00
Emanuel Schütze
00bb266098
Merge pull request #5726 from FinnStutzenstein/fixDebugEmailFlag
enable --debug-email for start and runserver
2020-11-25 15:07:54 +01:00
Finn Stutzenstein
0a67c24138
Enable bulk set presence for non-default auth type users
closes #5715
2020-11-25 15:06:17 +01:00
Finn Stutzenstein
667a841051
enable --debug-email for start and runserver
closes #5702
2020-11-25 14:53:41 +01:00
Finn Stutzenstein
4f24a38da8
Hotfix user restrictor. Wrong usage of set's add method 2020-11-25 12:04:24 +01:00
Sean
65c7d3491c
Merge pull request #5717 from emanuelschuetze/listType
Add ol list type.
2020-11-25 11:23:50 +01:00
Emanuel Schütze
b611642ecb
Merge pull request #5721 from FinnStutzenstein/fixGroupDeletionInConfig
Fix group deletion for config variables
2020-11-25 10:39:08 +01:00
Sean
1eee3bc56d
Merge pull request #5718 from tsiegleauq/negative-voting
Allow negative voting
2020-11-25 10:01:12 +01:00
Sean
b5cb694fc7 Allow negative voting
Adds "no" as the opposite of "votes" as assignment poll method
Added global_yes, enabled new voting mode `N` in the server
Layout, Tables, Charts, Projector, Vote CSS, Cleanups, Percent bases,
analog votes and more
2020-11-24 23:14:12 +01:00
Finn Stutzenstein
f609e6362f
Fix group deletion for config variables 2020-11-24 13:43:05 +01:00
Finn Stutzenstein
07a003717d
Remove the possibility to select default non-analog poll types, if electronic voting is disabled 2020-11-24 10:28:56 +01:00
Emanuel Schütze
ab230fe7a9 Allowed ol list types (in html and pdf). 2020-11-23 20:40:22 +01:00
Joshua Sangmeister
f3809fc8a9 Fixed HTML attribute validation 2020-11-20 16:10:32 +01:00
Finn Stutzenstein
38534d4e01
Include vote_delegated_from_users_id in required users (#5706)
* Include vote_delegated_from_users_id in required users

* Fix restrictors if users do not have base perms

* Fix from username building in the projector
2020-11-18 08:14:33 +01:00
Emanuel Schütze
d446382f70
Merge pull request #5694 from tsiegleauq/po-order-closed-lists
Allow point-of-order on closed list of speakers
2020-11-11 21:04:38 +01:00
Sean
2736917c7e Allow point-of-order on closed list of speakers
Allows to submit a new point of order even though the list of
speakers is closed
2020-11-10 13:10:35 +01:00
Finn Stutzenstein
72dc55558f
Add user_id validation for LOS and assignment candidates 2020-11-10 12:30:54 +01:00
Emanuel Schütze
f9796027ef Show point of order icon on projector (los slide) 2020-11-07 17:19:59 +01:00
Emanuel Schütze
def6e8d59d
Merge pull request #5682 from emanuelschuetze/translation-20201105
Updated translations
2020-11-05 22:54:23 +01:00
Emanuel Schütze
beb59cee73 Updated translations 2020-11-05 22:03:00 +01:00
Joshua Sangmeister
883463ea87 Deactivate empty votes for assignment polls 2020-11-05 16:44:22 +01:00
Sean
7ad3b78eb2
Merge pull request #5644 from tsiegleauq/point-of-order-in-listofspeakers
Add "point of order" feature to ListOfSpeakers
2020-11-04 14:36:40 +01:00
Sean
ccc48e6b3f
Add "point of order" feature to ListOfSpeakers
Adds the option "point of order" to the list of speakers
- You can make a point of order even though you normally have no
permission to add yourself to the ListOfSpeakers
- You can make a point of order even though you are already on theListOfSpeakers (but you may only be there once)
- new points of order will be on top of the list of speakers
- Point of orders will be highlighted by a red triangle

This feature can be used to request to speak with a higher level of
urgency
2020-11-03 12:40:36 +01:00
Finn Stutzenstein
866acfe7f5
Merge pull request #5658 from FinnStutzenstein/exposeMoreEmailSettings
Expose more email settings
2020-11-02 07:49:21 +01:00
Finn Stutzenstein
6943c3d18f
Expose more email settings 2020-11-02 07:26:09 +01:00
Finn Stutzenstein
06044e81c0
Merge pull request #5651 from simonla82/armSupport
Update Dockerfile to allow build via docker-compose on arm architectures
2020-10-29 07:56:36 +01:00
Finn Stutzenstein
eacccd8f5c
Merge pull request #5657 from FinnStutzenstein/smallFixes
Catch some tracebacks
2020-10-29 07:50:13 +01:00
simonla82
5502e5337a
Update Dockerfile to allow build via docker-compose on arm architectures
As stated in issue #5638 the installation via docker-compose fails on arm architectures since two librariers are not correctly installed. This is fixed by installing those manually in the /server/docker/Dockerfile
2020-10-28 13:16:38 +01:00
Finn Stutzenstein
0956153ea4
Create initial user command 2020-10-28 08:22:32 +01:00
Finn Stutzenstein
266f9b73e9
Merge pull request #5639 from FinnStutzenstein/useCacheInManagementCommands
Use cache in management commands
2020-10-28 08:20:01 +01:00
Finn Stutzenstein
d4577ed8aa
Merge pull request #5656 from FinnStutzenstein/SmtpException
Improve reporting of SMTP exception
2020-10-28 08:18:43 +01:00
Finn Stutzenstein
582215042d
Catch some tracebacks 2020-10-28 08:18:20 +01:00
Finn Stutzenstein
1dd86a29be
Improve reporting of SMTP exception 2020-10-27 07:59:37 +01:00
Manfred Löbling
2b5abf72a4 no exclustion of SAML Users on bulk-alter-group 2020-10-25 20:25:43 +01:00
Max Bachhuber
b214a69136
Fix check on wrong variable 2020-10-20 14:53:21 +02:00
Finn Stutzenstein
ca56b4f8b4
Use cache in management commands
This requires to have a correct setup when using these commands
2020-10-19 15:29:59 +02:00
Finn Stutzenstein
d317e032e7
Fix migrations to not use the cache 2020-10-14 07:48:40 +02:00
Jochen Winzer
4fef8ed4dc Correct sp attributes. 2020-10-12 16:03:35 +02:00
Finn Stutzenstein
f809db0430
Attempt to fix some tracebacks 2020-10-08 10:28:27 +02:00
Finn Stutzenstein
d739d401c4
Add a transaction to speaker handling
to prevent adding a users multiple times to the waiting queue of a list of speakers
2020-10-08 09:14:43 +02:00
Emanuel Schütze
21990aa568
Merge pull request #5602 from FinnStutzenstein/addDemoModeToDocker
Add demo mode to all docker setups
2020-10-07 23:30:35 +02:00
Finn Stutzenstein
fd2fd8d73a Add demo mode to all docker setups 2020-10-07 16:50:08 +02:00
Sean Engelhardt
823a87c164 Add amendment cr to lead motion slide
Adds amendment cr to the lead motion slide.
Previously the amendmet cr was only present in the amendment slide but was forgotten in the motion slide
2020-10-07 16:47:16 +02:00
Finn Stutzenstein
8d2a7f1b12
Merge pull request #5541 from jsangmeister/vote-delegation
Add vote delegation
2020-10-02 14:15:06 +02:00
Manfred
a94ce67c22
Update saml-setup.sh (#5580)
* Update saml-setup.sh

create symbolic link fails when container is restarted
2020-10-02 07:40:04 +02:00
Joshua Sangmeister
3ac8569712
Add vote delegation on server side
Add user_has_voted_for_delegations. Add tests

Prevent self delegation

Make delegated_user visible
2020-09-30 14:05:22 +02:00
Finn Stutzenstein
c0fb65316c
Merge pull request #5584 from FinnStutzenstein/updateDockerignore
Update .dockerignore to reduce the context size
2020-09-29 17:05:25 +02:00
Finn Stutzenstein
90e13a0f8e
Update .dockerignore to reduce the context size 2020-09-29 16:16:58 +02:00
topelrapha
88994efac3
Fix server stop working because of changed python package (#5582)
* Fix server stop working because of changed python package

* Update AUTHORS
2020-09-29 16:06:28 +02:00
Finn Stutzenstein
ed2c298928
Merge pull request #5555 from jsangmeister/fix-non-nominal-votes-assignment-poll
Fix non-nominal voting on assignment polls with type votes
2020-09-28 15:26:09 +02:00
Emanuel Schütze
cf4573cb54
Merge pull request #5515 from tsiegleauq/lazy-user-mode
Implement cinema mode (autopilot)
2020-09-23 08:37:33 +02:00
Sean Engelhardt
7f53636b7b Add vjs live steam poster url as config
Adds a new config to show a poster url in the live stream view
2020-09-22 14:53:31 +02:00
Sean
ec13ab56e8 Implement cinema mode
Implements a viewer mode containing the most important information and
Heavily refactors ListOfSpeaker and CurrentListOfSpeaker
interaction heavy components on a single view:

Current List of Speakers
Currently Open Polls
Current projector

Permission in migration
2020-09-17 18:38:57 +02:00
Sean
4712707d6b Add amendment projection defaults
Creates projection defaults for (paragraph based) amendments.
Adds a migration to add amendments as projection defaults.

Will only work for paragraph based amendments, other amendments will
still be considered motions
2020-09-16 15:41:11 +02:00
Joshua Sangmeister
8d92353047 Fix non-nominal voting on assignment polls with type votes 2020-09-15 14:48:26 +02:00
Finn Stutzenstein
d893f3dbe5 Always include CRs in motion slide
Show Amendment CR in Projector

Shows the amendment CR in the projector if the projected slide is in
diff version.
Only shows direct Change recos to amended paragraphs
2020-09-10 19:38:25 +02:00
Emanuel Schütze
fb27f8ce8a
Merge pull request #5519 from tsiegleauq/fix-jitsi-password-doc
Change jitsi_password to jitsi_room_password
2020-09-04 15:10:09 +02:00
Finn Stutzenstein
325c5ea1f4
Fixing black 2020-08-31 13:24:16 +02:00
Sean
0933bb6abd Change jitsi_password to jitsi_room_password
Fixes false naming in both documentation, template
and docker
2020-08-21 15:46:43 +02:00
Finn Stutzenstein
9ddf9ddb8c
fixed lost changes 2020-08-21 08:11:16 +02:00
Gernot Schulz
251296f42f
Docker: No longer install Vim in server 2020-08-21 08:11:16 +02:00
Gernot Schulz
9a2d3a3760
Docker: Add SAML configuration
To configure SAML, ENABLE_SAML must be set to True in .env.
Additionally, the following files must be provided in ./secrets/saml/:

  - sp.crt
  - sp.key
  - saml_settings.json

The files will be added as Docker secrets.

Even though saml_settings.json does not contain secret information
per se it is nonetheless added as a secret for simplicity.  Technically,
the file is equally suited to be configured as a "Docker config".

Please note:

  - This patch has not been tested yet.
  - python3-saml's version should probably be pinned.
2020-08-21 08:11:16 +02:00
Gernot Schulz
418480bff5
build.sh: Make build script more useful
build.sh replaces docker-compose as an image build tool.  Instead, all
OpenSlides services can be built using this script which offers various
important options such as tagging and configurable defaults.

The now-redundant build instructions have been removed from the YAML
templates.

The almost identical server and client build scripts have been made
fully identical.
2020-08-21 08:11:15 +02:00
Gernot Schulz
9c9f268fbf
Docker: Shorten server-db-setup service name 2020-08-21 08:11:15 +02:00
Gernot Schulz
4f194a8794
Docker: Add a Docker secret for the Django key
We have decided against including an insecure default key with a mere
warning.  Therefore, unlike the admin and user secrets, the availability
of this secret is a hard requirement.  The instance will not be able to
start before a secret has been generated manually or by a management
tool.
2020-08-21 08:11:14 +02:00
Gernot Schulz
683aed56bb
server: Fix exec args in entrypoint 2020-08-21 08:11:14 +02:00
FinnStutzenstein
2bcab5d098
Repository restructure
- moved all server related things into the folder `server`, so this
configuration is parallel to the client.
- All main "services" are now folders in the root directory
- Added Dockerfiles to each service (currently server and client)
- Added a docker compose configuration to start everything together.
Currently there are heavy dependencies into https://github.com/OpenSlides/openslides-docker-compose
- Resturctured the .gitignore. If someone needs something excluded,
please add it to the right section.
- Added initial build setup with Docker and docker-compose.
- removed setup.py. We won't deliver OpenSlides via pip anymore.
2020-08-21 08:11:13 +02:00