Commit Graph

8649 Commits

Author SHA1 Message Date
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
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
644d3b2fee
Merge pull request #5977 from FinnStutzenstein/enablePytestInDocker
Enable pytest in docker
2021-03-22 13:17:30 +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
Finn Stutzenstein
7bbd8688a2
Merge pull request #5970 from FinnStutzenstein/updateClientDeps
Client dependencies
2021-03-22 08:52:31 +01:00
Finn Stutzenstein
c10a0ad70d
Client dependencies:
- Update ng2-pdf-viewer
- Lock down tsparticles and ng-particles to the version in the
package-lock.json. In fresh installs newer versions do not work
currently
2021-03-22 07:55:37 +01:00
Emanuel Schütze
3595245663
Merge pull request #5972 from emanuelschuetze/translations20210319
Updated translations
2021-03-19 14:39:00 +01:00
Emanuel Schütze
bd29777d83 Updated translations 2021-03-19 14:20:15 +01:00
Emanuel Schütze
eadb0e2f0e
Merge pull request #5971 from emanuelschuetze/autoupdate
Updated autoupdate service
2021-03-19 10:01:13 +01:00
Emanuel Schütze
d1aba2ef94 Updated autoupdate service 2021-03-19 09:46:07 +01:00
Emanuel Schütze
2e1690d2d0
Merge pull request #5967 from FinnStutzenstein/loginErrorNonActive
Add login errors for inactive users
2021-03-19 09:42:44 +01:00
Finn Stutzenstein
a48fe86791
Add login errors for inactive users 2021-03-19 07:35:45 +01:00
Finn Stutzenstein
63132fdbc5
Merge pull request #5966 from FinnStutzenstein/smallMediafileFixes
Small mediafile fixes
2021-03-19 07:34:02 +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
Finn Stutzenstein
520915c3f5
Merge pull request #5910 from mdickopp/mdickopp/list-of-speakers-inital-state-configurable
Make configurable whether a newly created list of speakers is initial…
2021-03-11 08:56:29 +01:00
Emanuel Schütze
b76e75ae96
Merge pull request #5948 from emanuelschuetze/autoupdate
Updated autoupdate service
2021-03-09 21:08:27 +01:00
Emanuel Schütze
1a538e241d Updated autoupdate service 2021-03-09 20:49:52 +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
Emanuel Schütze
4d706f648f
Merge pull request #5943 from emanuelschuetze/translationDiffService
Add translation service to DiffService.
2021-03-08 13:28:59 +01:00
Emanuel Schütze
ba0e9b3bc6 Add translation service to DiffService. 2021-03-08 12:54:22 +01:00
Emanuel Schütze
92afd07b62
Merge pull request #5940 from CatoTH/bugfix/dont-show-diff-view-with-no-crs-on-slides
Don't show diff view on slides if no change recos exist
2021-03-08 11:49:05 +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
Tobias Hößl
bef322d0a4
Don't show diff view on slides if no change recos exist 2021-03-06 19:16:22 +01:00
Emanuel Schütze
a11682a708
Merge pull request #5939 from emanuelschuetze/translation-20210304
Updated translations
2021-03-05 08:33:10 +01:00