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

8775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Emanuel Schütze
26d5d81b6f
Merge pull request #5997 from jsangmeister/remove-duplicates-from-entitled-users 
Prevent multiple entries in entitled_users_at_stop
 2021-04-08 15:39:14 +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
Emanuel Schütze
1edf4437a0
Merge pull request #5992 from CatoTH/bugfix/diff-only-formatting-changes 
Allow formatting-only-changes without breaking the inline diff
 2021-04-06 22:35:07 +02:00
Tobias Hößl
ba177a89d4
Allow formatting-only-changes without breaking the inline diff 2021-04-05 11:58:09 +02:00
Emanuel Schütze
d059afac5a
Merge pull request #5989 from emanuelschuetze/translations-20210401 
Updated translations
 2021-04-01 18:02:10 +02:00
Emanuel Schütze
045648eddb Updated translations 2021-04-01 17:45:29 +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
83549ce02b
Merge pull request #5916 from ostcar/performance 
Performance
 2021-04-01 10:02:26 +02:00
Oskar Hahn
dca6143041 Add performance tool 2021-04-01 09:19:21 +02:00
Emanuel Schütze
2d4419530e
Merge pull request #5987 from CatoTH/bugfix/escape-special-characters 
Bugfix: change detection for additional special characters
 2021-04-01 09:08:44 +02:00
Finn Stutzenstein
28980afbd5
Merge pull request #5981 from FinnStutzenstein/spinnerErrors 
Do not show old errors on the spinner
 2021-04-01 09:02:57 +02:00
Tobias Hößl
7275aa69af
Bugfix: change detection for additional special characters 2021-03-31 21:44:53 +02:00
Gernot Schulz
1ad0a61524 Docker: Simplify image name/registry handling 
For a subset of the images required by a Compose or Swarm Setup,
non-default names can be configured in .env.  Originally, the names were
treated as the images' complete names, i.e., including an optional
registry domain.  Using this setup, it was possible to pull the
irregularly updated auxiliary images from a default registry while, at
the same time, obtaining certain images from different registries.

Commit e225a57f97 changed this behavior.  Since then, the names in .env
can only be used to change part of the image name, excluding the
registry.  If a default registry is configured it is always prepended to
the given image name, breaking the original use case.

This patch removes the ability to override image names in .env.
Instead, the registry of each image can be customized.

The reasoning here is that the only common reason to change an image
name is to change its Docker registry.  For example, while the default
registry may be set to default.example.com, it may be necessary to
obtain the backend image private.example.com/openslides-server.  With
this patch, that would be achieved by the following configuration in
.env:

    DOCKER_OPENSLIDES_BACKEND_REGISTRY="private.example.com"

For special cases, for which the images' basename must indeed be changed
as well, the template would need to be customized.

The templates are not backwards-compatible.
 2021-03-31 15:08:32 +02:00
Finn Stutzenstein
ca298960ae
Do not show old errors on the spinner 2021-03-25 15:23:06 +01:00
Emanuel Schütze
2f9b6aba95
Merge pull request #5979 from tsiegleauq/poll-method-makes-sense 
Disable general no/yes depending on poll method
 2021-03-25 10:06:58 +01:00
Sean
49dba31d56 Disable general no/yes depending on poll method 
During the creation of an assignment poll:
Disable and unset the general yes control if the poll method is "yes"
Disables and unset the general no control if the poll method if "no"
 2021-03-25 09:55:13 +01:00
Emanuel Schütze
f68fca8c83
Merge pull request #5980 from emanuelschuetze/translations-20210322 
Updated translations
 2021-03-22 21:39:29 +01:00
Emanuel Schütze
2e43a17987 Updated translations 2021-03-22 21:20:15 +01:00
Emanuel Schütze
2e5cea512e
Merge pull request #5957 from CatoTH/bugfix/add-warning-when-editing-motion-with-amendments 
Add a warning when editing a motion with existing amendments
 2021-03-22 21:15:02 +01:00
Tobias Hößl
9c2e49692c Add a warning when editing a motion with existing amendments 2021-03-22 21:00:04 +01:00