ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,752 Commits 6 Branches 42 Tags 64 MiB
cc6cf9ea42
Commit Graph

8752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
2a7b55f11e
Merge pull request #6051 from tsiegleauq/enumerate-all-assignments 
Enumber Voting results
 2021-05-05 14:57:23 +02:00
Sean
18c75a6d12 Enumber Voting results 
Enumber the rank of voting results in PDF, Projector and Detail View
 2021-05-05 14:49:42 +02:00
Emanuel Schütze
7cf22b86ab
Merge pull request #6050 from tsiegleauq/assignment-analog-general-selection 
Add General x to analog polls
 2021-05-05 14:08:01 +02:00
Sean
0011d63a40 Add General x to analog polls 
Adds general approval/rejection/abstain to analog polls
Fix a bug where the 100% base "Entitled" would render analog polls unusable
enumerate poll candidates
 2021-05-05 12:03:41 +02:00
Sean
08fa38a89c
Merge pull request #6049 from tsiegleauq/users-cannot-see-candidate-names 
Fix user cannot see candidate names
 2021-05-04 16:23:39 +02:00
Emanuel Schütze
5cee662058
Merge pull request #5915 from gsiv/dev/prom 
Docker: Improve Prometheus integration
 2021-05-04 16:08:04 +02:00
Sean
0b23806db6 Fix user cannot see candidate names 
Assignment detail view sort list "getTitle" was hidden behind
"assignment_can_manage", thus users could not see the names of candidates
 2021-05-04 15:47:15 +02:00
Emanuel Schütze
acf416b024
Merge pull request #6048 from emanuelschuetze/autoupdate 
Updated autoupdate service
 2021-05-03 13:56:30 +02:00
Emanuel Schütze
ec2c905f7d Updated autoupdate 2021-05-03 13:13:49 +02:00
Emanuel Schütze
74981e26c0
Merge pull request #6037 from tsiegleauq/poll-progress-speaker-manage 
Allow LOS-Manager to see poll progress
 2021-05-03 13:11:30 +02:00
Emanuel Schütze
261c69387f
Merge pull request #6047 from CatoTH/bugfix-6030-amending-list-items 
Fixes #6030 - amending a list item does not show the change inline in…
 2021-05-03 13:01:49 +02:00
Tobias Hößl
705c42bd11
Fixes #6030 - amending a list item does not show the change inline in diff box 2021-05-02 20:10:19 +02:00
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
Emanuel Schütze
88e870c9df
Merge pull request #6040 from tsiegleauq/search-cannot-find-uml 
Find umlauts using search
 2021-04-29 15:38:29 +02:00
Emanuel Schütze
325469bc82
Merge pull request #6038 from FinnStutzenstein/fix-los 
Fix LOS (closes #6035)
 2021-04-29 15:03:54 +02:00
Emanuel Schütze
14687bba0e
Merge pull request #6042 from emanuelschuetze/new-languages 
Added new translations (it, es).
 2021-04-29 14:35:36 +02:00
Emanuel Schütze
db4c593adf Added new translations (it, es). 2021-04-29 14:12:52 +02:00
Finn Stutzenstein
75bd3c50e5
Fix LOS (closes #6035) 2021-04-29 13:46:36 +02:00
Sean
d08752db21 Find umlauts using search 
TinyMCE currently escapes all special chatacters pretty unconviniently.
We now try to parse HTML using DOMParser and extract the text content so
we can actually search for it
 2021-04-29 11:09:53 +02:00
Sean
85bb9f751d Allow LOS-Manager to see poll progress 
Adjust poll progress bar to be visible for LOS-Manager.
Cleans up redundant permission asking
Adds push CD to progress bar to react better on permission changs
 2021-04-28 13:10:29 +02:00
Emanuel Schütze
d030925e14
Merge pull request #6036 from emanuelschuetze/translation-20210427 
Updated translations
 2021-04-27 23:53:20 +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
Finn Stutzenstein
91a15d24a8
Add ALLOWED_HOSTS 
the proxy responds with a 421, if a host header with an invalid host
name is encountered. If nothing is provided (see default .env) all hosts
are allowed. Examples:

ALLOWED_HOSTS="localhost:8000 127.0.0.1:8000"

ALLOWED_HOSTS="some.domain.example.com"

Add EXTERNAL_HTTPS_PORT. See .env for the configuration.
 2021-04-26 16:01:35 +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
ee8702aff1
Merge pull request #5921 from gsiv/dev/yml-image-override 
Docker: Allow overriding image names from .env
 2021-04-26 10:16:02 +02:00
Finn Stutzenstein
0d4673d182
Merge pull request #6028 from FinnStutzenstein/updateBlack 
Update black
 2021-04-26 09:30:07 +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
Emanuel Schütze
fafcf5d583
Merge pull request #6025 from FinnStutzenstein/fromEmailValidation 
Validate the from email for invalid characters
 2021-04-22 15:34:15 +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
Emanuel Schütze
4f35770769
Merge pull request #6009 from tsiegleauq/some-vscroll-for-motion 
Some enhancements for motion detail
 2021-04-15 21:21:11 +02:00
Sean
697177640b Some enhancements for motion detail 
Vscroll for the list of changes
List of changes can collapse
direct link to an amendment over the list of changes
Vscroll for the amendment create wizzard
Line numbers in the amendment create wizzard
Some css cleanup
 2021-04-15 20:58:08 +02:00
Emanuel Schütze
196e39ad15
Merge pull request #6006 from jsangmeister/fix-voting-race-condition 
Lock poll to prevent race conditions
 2021-04-15 20:46:43 +02:00
Joshua Sangmeister
ee31c1e633 Lock poll to prevent race conditions 
Add migrations
 2021-04-15 15:19:30 +02:00
Emanuel Schütze
bdbb5839cc
Merge pull request #6007 from emanuelschuetze/autoupdate 
Updated autoupdate service
 2021-04-13 08:46:43 +02:00
Emanuel Schütze
dff5ae4a89 Updated autoupdate service 2021-04-12 21:13:52 +02:00
Finn Stutzenstein
79d9781a1b
Merge pull request #6005 from FinnStutzenstein/updateDeps 
Update dependencies
 2021-04-12 14:04:05 +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
feb54c52a3
Merge pull request #6002 from emanuelschuetze/autoupdate 
Updated autoupdate service
 2021-04-08 21:18:04 +02:00
Emanuel Schütze
bb651b67eb Updated autoupdate service 2021-04-08 19:05:04 +02:00
Emanuel Schütze
5b58730cca
Merge pull request #5995 from ostcar/performance_create_motions 
Create amendments
 2021-04-08 18:57:53 +02:00
Oskar Hahn
23fcc3a7d0 Create dummy amendments with performance test script. 2021-04-08 18:38:25 +02:00