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

8691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Finn Stutzenstein
93da435e7c
Remove voted_id for ongoing polls 2021-03-04 07:56:11 +01:00
Emanuel Schütze
45948c47fb
Merge pull request #5881 from FinnStutzenstein/updateDeps 
Update Dependencies
 2021-03-02 23:15:53 +01:00
Finn Stutzenstein
3504a87295 Update Dependencies 2021-03-02 22:53:48 +01:00
Emanuel Schütze
d83b7c0ea9
Merge pull request #5933 from emanuelschuetze/translations-20210302 
Updated translations
 2021-03-02 22:48:41 +01:00
Emanuel Schütze
155ade1a8c Updated translations 2021-03-02 22:27:45 +01:00
Emanuel Schütze
f80ac1d9c5
Merge pull request #5932 from emanuelschuetze/autoupdate 
Updated autoupdate service
 2021-03-01 20:45:56 +01:00
Emanuel Schütze
2c7196493d Updated autoupdate service 2021-03-01 20:24:19 +01:00
Emanuel Schütze
46223328f7
Merge pull request #5926 from FinnStutzenstein/quotaexceedederror 
Error handling
 2021-03-01 17:38:55 +01:00
Finn Stutzenstein
619a698272 Error handling: 
- catch QuotaExceededError
- add generic error message to the spinner
 2021-03-01 17:10:22 +01:00
GabrielInTheWorld
a450a1dff5
Merge pull request #5898 from GabrielInTheWorld/cleanup-fix-spinner 
Some cleanup in favor of spinner-fixes
 2021-03-01 16:49:02 +01:00
Emanuel Schütze
d73b2142b7
Merge pull request #5928 from FinnStutzenstein/orderAssignmentOptions 
order assignment options by weight
 2021-03-01 16:25:14 +01:00
Emanuel Schütze
05fcf40b51
Merge pull request #5929 from FinnStutzenstein/chatPersistance 
Do not clear chat notifications from local storage
 2021-03-01 16:19:28 +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
GabrielMeyer
7314bf0999 Cleanup spinner-fixes 
- Rename: noop-interceptor -> stable-interceptor
- Put logic from stable.service to openslides-status.service
 2021-03-01 16:11:08 +01:00
Emanuel Schütze
d3530a3657
Merge pull request #5931 from emanuelschuetze/caddy-dev 
Disabled caddy debug mode in dev setup.
 2021-03-01 15:49:30 +01:00
Emanuel Schütze
3d8f3a69af Disabled caddy debug mode in dev setup. 2021-03-01 15:39:51 +01:00
Emanuel Schütze
7dcc0ad42a
Merge pull request #5924 from emanuelschuetze/agenda-config 
Fixed showSubtitle config. Reordered agenda config.
 2021-03-01 15:37:17 +01:00
Finn Stutzenstein
c35cacebb1
Merge pull request #5930 from FinnStutzenstein/losPermissions 
Fix usage of osPerms
 2021-03-01 15:37:06 +01:00
Gernot Schulz
614e0f2d5f Docker: Add Prometheus as an optional service 2021-03-01 15:24:06 +01:00
Emanuel Schütze
4e6f0850c4 Fixed showSubtitle config. Reordered agenda config. 2021-03-01 15:21:43 +01:00
Finn Stutzenstein
33fca309c4
Fix usage of osPerms 2021-03-01 15:14:13 +01:00
Finn Stutzenstein
b13732f9ec
Do not clear chat notifications from local storage 2021-03-01 15:00:47 +01:00
Finn Stutzenstein
0a8274e6e2
order assignment options by weight 2021-03-01 14:40:06 +01:00
Finn Stutzenstein
a9045b6a1c
Point of order only for agenda.can_be_speaker 2021-03-01 14:31:40 +01:00
Emanuel Schütze
2d4ece84a0
Merge pull request #5922 from gsiv/dev/build-proxy-default 
Docker: Remove proxy as a default build target
 2021-03-01 13:26:36 +01:00
Emanuel Schütze
a796b2a8b8
Merge pull request #5923 from gsiv/dev/yml-nocmd 
Docker: Remove server command override examples
 2021-03-01 13:25:17 +01:00
Gernot Schulz
cd98502b1c Docker: Remove server command override examples 
The YAML configuration files include comments outlining how to override
the server image's default command.  They are supposed to help with, for
example, replacing gunicorn with daphne.

These comments have diverged from the actual command used in current
images.  Furthermore, at least to my knowledge, the setup has not been
used or tested with daphne in a long time.  For these reasons, this
patch removes the comments without a replacement.

If there still is, in fact, a use case for the instructions, they would
need to be updated and their location should be reconsidered.
 2021-03-01 11:06:52 +01:00
Gernot Schulz
8d393ba17f Docker: Remove proxy as a default build target 
The proxy image is not going to be subject to regular change and is
instead more similar to services such as the database.  Therefore, it
does not need to be a default build target of build.sh.
 2021-03-01 10:48:47 +01:00
Emanuel Schütze
e75bdeb0f7
Merge pull request #5913 from FinnStutzenstein/fixPointOfOrderWeighting 
Fix point of order weighting
 2021-02-23 11:11:51 +01:00
Finn Stutzenstein
f8446ee609
Fix point of order weighting 2021-02-22 13:33:36 +01:00
Emanuel Schütze
baad950698
Merge pull request #5902 from FinnStutzenstein/ChatAccessGroups 
Change chat access groups
 2021-02-19 15:18:08 +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
Emanuel Schütze
e72cebca4a
Merge pull request #5909 from emanuelschuetze/autoupdate-20210219 
Updated autoupdate service
 2021-02-19 13:20:15 +01:00
Emanuel Schütze
e11f0f6f25
Merge pull request #5908 from fwolfst/README-IMPROVEMENTS 
improve links in README
 2021-02-19 13:20:03 +01:00
Emanuel Schütze
9f16bfee21 Updated autoupdate service 2021-02-19 13:01:07 +01:00
Felix Wolfsteller
5152a448be improve links in README 2021-02-19 12:52:17 +01:00
Emanuel Schütze
500b773ee1
Merge pull request #5903 from emanuelschuetze/autoupdate 
Updated autoupdate service
 2021-02-18 11:52:48 +01:00
Emanuel Schütze
a8fcb89f48 Updated autoupdate service 2021-02-18 11:39:20 +01:00
Finn Stutzenstein
085ada3dc4
Merge pull request #5894 from FinnStutzenstein/caddyHttps 
add optional https for caddy
 2021-02-17 08:56:20 +01:00
Finn Stutzenstein
ce3e2588c5
add optional https for caddy 2021-02-17 08:28:47 +01:00
Emanuel Schütze
7e875c45db
Merge pull request #5897 from GabrielInTheWorld/fix-spinner 
Fixes an infinite running spinner
 2021-02-15 15:35:29 +01:00
GabrielMeyer
e74df38a0f Fixes an infinite running spinner 
The ApplicationRef propagates never a stable state, when in cinema mode. This is, because in the `cinema.component.ts` asynchronous requests are made, before the app was getting stable.
 2021-02-15 15:18:10 +01:00
Emanuel Schütze
ef451afae1
Merge pull request #5896 from tsiegleauq/more-jitsi-cd 
More change detection in jitsi bar
 2021-02-15 14:50:09 +01:00
Sean
4490ee91d0 More change detection in jitsi bar 2021-02-15 14:34:36 +01:00
Emanuel Schütze
3012fabf4f
Merge pull request #5895 from FinnStutzenstein/removeDebugPrints 
Remove debug prints
 2021-02-15 12:56:23 +01:00
Finn Stutzenstein
fe0f8d28f4
Remove debug prints 2021-02-15 11:32:24 +01:00
Emanuel Schütze
a3a126f930
Merge pull request #5891 from ostcar/prometheus 
Prometheus
 2021-02-15 11:07:26 +01:00
Oskar Hahn
69bf46a5ff Prometheus 2021-02-15 10:50:12 +01:00
Finn Stutzenstein
5b91ba4597
Merge pull request #5850 from FinnStutzenstein/ownSessionRedis 
Own session redis
 2021-02-15 08:14:04 +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