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
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
Finn Stutzenstein
05ec54927b
Merge pull request #5892 from FinnStutzenstein/PdfKeyError 
Catch pyPDF2 key error
 2021-02-15 07:37:10 +01:00
Finn Stutzenstein
e9c2dc90d5
Catch pyPDF2 key error 2021-02-15 07:22:38 +01:00
Emanuel Schütze
7af39a5570
Merge pull request #5888 from tsiegleauq/some-iOS-for-fixes 
Fix paragraph based amendments in iOS
 2021-02-12 14:58:53 +01:00
Sean
eda242e83f Fix paragraph based amnedments in iOS 
Fixes an issue on iOS devices regarding click-bindings in structural
loops.
iOS devices did not respond to any touch inputs in the given view.
The same behavious was observed in #5351
This is most a bug in angular or iOS webkit
 2021-02-12 13:11:46 +01:00
Emanuel Schütze
c1b4d3154d
Merge pull request #5886 from emanuelschuetze/translations-20210211 
Updated translations
 2021-02-11 21:57:54 +01:00
Emanuel Schütze
1cf2763ed6 Updated translations 2021-02-11 21:33:18 +01:00
Emanuel Schütze
c0dad72eb4
Merge pull request #5882 from FinnStutzenstein/fixPointOfOrderSorting 
Fix point of order sorting
 2021-02-11 21:15:42 +01:00
Emanuel Schütze
aac8ec8f2e
Merge pull request #5876 from tsiegleauq/chat 
Chat
 2021-02-11 20:42:36 +01:00
Sean
69adc1d41c Add Chat UI Components 
Add Chat User Interface
Restructure some services
Virtual Scrolling
Manual change detection for message updates
Enhanced Date pipe
Message layout
Tabbed reusable chat window
Deleting messages
Further permission checks
Delete-prompts
Mobile friendly chat usage
automatically scroll to bottom
 2021-02-11 17:10:25 +01:00
Finn Stutzenstein
b0ccb1ea7e
Fix point of order sorting 2021-02-10 15:58:01 +01:00
Finn Stutzenstein
7fffffb497
Merge pull request #5877 from FinnStutzenstein/fixCaddyDevSetup 
fix Caddy dev setup
 2021-02-10 07:55:12 +01:00
Finn Stutzenstein
f65e8ae819
fix Caddy dev setup 2021-02-10 07:30:36 +01:00
Finn Stutzenstein
8e5b1fa99d Add Chat on Server and client as draft 2021-02-09 16:07:52 +01:00
Emanuel Schütze
8e98966db2
Merge pull request #5875 from gsiv/fix/caddy-builddev 
Update Makefiles for Caddy
 2021-02-08 18:01:57 +01:00
Gernot Schulz
0ed4e27725 Update Makefiles for Caddy 
The reload-haproxy target has simply been removed due to time
constraints.
 2021-02-08 17:42:56 +01:00
Emanuel Schütze
5910d2c914
Merge pull request #5874 from emanuelschuetze/translations-20210208 
Updated translations
 2021-02-08 17:22:17 +01:00