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

8479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Emanuel Schütze
612bf78871 Updated translations 2021-02-08 17:07:32 +01:00
Emanuel Schütze
c569835ce1
Merge pull request #5872 from gsiv/dev/caddy 
Docker: Rename proxy-related variables
 2021-02-08 16:42:09 +01:00
Gernot Schulz
a1e65e8a47 Docker: Rename proxy-related variables 
HAProxy was replaced by Caddy, so obviously variables should not longer
carry HAPROXY in their names to avoid confusion.

To hopefully make future changes less likely to break configurations,
we'll keep variable and image names generic (proxy instead of caddy).
 2021-02-08 14:53:45 +01:00
Gernot Schulz
67202a4a4b Remove haproxy 
Replaced by Caddy
 2021-02-08 13:45:36 +01:00
Emanuel Schütze
ac0a27276c
Merge pull request #5862 from ostcar/caddy-dev 
Use https in dev mode
 2021-02-06 14:28:25 +01:00
Oskar Hahn
ab2a8ca419 Use https in dev mode 2021-02-06 11:47:38 +01:00
Emanuel Schütze
180de2d3a9
Merge pull request #5860 from ostcar/fix_development 
Fix Development
 2021-02-05 22:10:34 +01:00
Oskar Hahn
d7d8dcb3c9 Fix Development 2021-02-05 19:26:04 +01:00
Emanuel Schütze
d05958ca10
Merge pull request #5851 from ostcar/caddy 
Use caddy
 2021-02-05 18:17:51 +01:00
Gernot Schulz
f7d228a600 Docker: Update build scripts for Caddy 
For now, keep using HAProxy's name in most places, e.g.,
DOCKER_OPENSLIDES_HAPROXY_NAME.  To avoid confusion, the specific
mentions of HAProxy should be made more generic, e.g.,
DOCKER_OPENSLIDES_PROXY_NAME.
 2021-02-05 18:00:04 +01:00
Gernot Schulz
40dc0e08fa Caddy: Add config to image instead of using a volume 2021-02-05 17:59:57 +01:00
Gernot Schulz
470168c58c Caddy: Do not use TLS for autoupdate connection 2021-02-05 17:59:36 +01:00
Emanuel Schütze
b08948f3e5
Merge pull request #5857 from normanjaeckel/HistoryReally 
Added information to poll start and stop.
 2021-02-05 15:37:40 +01:00
Norman Jäckel
c3de6dc870 Added information to poll start and stop. 2021-02-05 15:28:37 +01:00
Emanuel Schütze
09bc7f093a
Merge pull request #5770 from tsiegleauq/youtube-urls 
Support youtube as livestream URL
 2021-02-05 14:29:51 +01:00
Sean
372f1eaa7e Support youtube as livestream URL 
Allows to use youtube as as live stream url config,
will load the youtube embedded player in an iframe instead
of video.js
 2021-02-05 14:00:52 +01:00
Finn Stutzenstein
f57fe05e26
Merge pull request #5853 from normanjaeckel/HistoryInformationChanges 
Updated README
 2021-02-05 13:47:31 +01:00
Emanuel Schütze
26744fde9f
Merge pull request #5856 from FinnStutzenstein/updateClient 
update client
 2021-02-05 13:04:07 +01:00
Finn Stutzenstein
1b482871ac
update client 2021-02-05 12:54:09 +01:00
Finn Stutzenstein
8746496d2d
Merge pull request #5852 from emanuelschuetze/removed-setuppy 
Removed pip support
 2021-02-05 12:03:58 +01:00
Norman Jäckel
cc5bcf1a81 Updated README 2021-02-05 12:01:48 +01:00
Norman Jäckel
f74cf10ff3
Merge pull request #5854 from FinnStutzenstein/fixDockercomposeDev 
Fix docker compose dev
 2021-02-05 12:00:43 +01:00
Finn Stutzenstein
9e38ed955f
Fix docker compose dev 2021-02-05 12:00:11 +01:00
Sean
058a7f71ae
Merge pull request #5823 from tsiegleauq/fix-group-import 
Fix csv importing users with groups
 2021-02-05 10:38:36 +01:00
Oskar Hahn
799dd08e0d client listens 4200 in prod 2021-02-05 09:47:04 +01:00
Emanuel Schütze
3b1b396e9a Removed setup.py and MANIFEST 
Reason: pip supported is dropped for next OpenSlides release (3.4)
because the python server cannot run stand-alone anymore. You will cannot
install OpenSlides 3.4 via 'pip install openslides'.
 2021-02-04 22:17:46 +01:00
Emanuel Schütze
72b7162eeb
Merge pull request #5842 from FinnStutzenstein/sortPooSpeakers 
Order point of order speakers in the request order (closes #5816)
 2021-02-04 22:03:11 +01:00
Oskar Hahn
dc58752575 Use caddy 2021-02-04 20:54:57 +01:00
Finn Stutzenstein
5b2f8409e4
Merge pull request #5847 from FinnStutzenstein/loadingIndicator 
Wait for a stable app (closes #5813)
 2021-02-04 13:08:05 +01:00
Finn Stutzenstein
a839294add
Wait for a stable app (closes #5813) 2021-02-04 12:33:20 +01:00
Emanuel Schütze
e5f0ebd6e5
Merge pull request #5832 from tsiegleauq/jitsi-helpdesk 
Add helpdesk icon and feature
 2021-02-03 11:42:59 +01:00
Sean
bd65b5d41c
Merge pull request #5841 from tsiegleauq/clean-some-applause 
Cleanup some applause code
 2021-02-03 10:02:39 +01:00
Finn Stutzenstein
94c943cdb5
Order point of order speakers in the request order (closes #5816) 2021-02-03 09:15:28 +01:00
Sean
04eedc7c37 Cleanup some applause code 
Cleans some applause code
 2021-02-02 15:52:55 +01:00
Finn Stutzenstein
a20641fe44
Merge pull request #5828 from FinnStutzenstein/offlineBarReconnect 
Fixes offline bar on successful reconnections (closes #5810).
 2021-02-02 13:12:09 +01:00
Sean
024b9c74e6 Add helpdesk icon and feature 
Adds a "helpdesk" Jitsi room feature.
Can be enabled using the OpenSlides config page

Shows a 'Call support' button in the conference control bar
clicking the support button will connect the user
to a "support" jitsi room
The name of the support room will be
`JITSI_ROOM_NAME`-SUPPORT
 2021-02-02 13:03:30 +01:00
Finn Stutzenstein
1380812924
Fixes offline bar on successful reconnections (closes #5810). 2021-02-02 11:56:04 +01:00
Sean
cc65b756c7
Merge pull request #5811 from tsiegleauq/applause-client 
Add applause in client
 2021-02-01 13:34:30 +01:00
Sean
e3d718cad0 Add applause in client 
Applause button in Jitsi Bar,
Add Applause Service,
Add Applause Display component,
Add Config varriables,
Integrate applause display component in Jitsi bar,
Integrate custom vertical progress bar as own component,
  - vertical and more customizable than the mat-progress-bar
  - includes an optional end icon
  - animated and themed
Add custom clapping icon
applause particles using tsparticles
custom particle component
dynamic add and remove functions to alter particles in runtime
Set own particle shape
Use smooth emitter for clean particle spawning
 2021-01-28 15:42:19 +01:00
Finn Stutzenstein
47a2204921
Merge pull request #5822 from mdickopp/mdickopp/pwGeneration 
Improve client-side password generation
 2021-01-26 11:21:55 +01:00
Sean
878f3a7ab3 Fix csv importing users with groups 
old groups
new groups created on the fly
 2021-01-26 11:11:05 +01:00
Finn Stutzenstein
676bda8cc3
Merge pull request #5821 from danilobuerger/django-env 
Allow preset env variable for django secret
 2021-01-26 09:19:48 +01:00
Martin Dickopp
2130f4970f Improve password generation 
Generating an 8-bit random number and reducing it modulo 56
(characters.length) does not choose all numbers 0 to 55 with equal
probability, but chooses 0 to 31 with higher probability than 32 to 55.
This change improves the password generation algorithms by choosing all
characters with equal probability.
 2021-01-24 19:14:20 +01:00
Danilo Bürger
11d7f7b888
Allow preset env variable for django secret 
The source command fails if /run/secrets/django does not exist. This is however not important if DJANGO_SECRET_KEY is already set. This is checked in the next step
 2021-01-22 21:08:34 +01:00
Gernot Schulz
7e67e0db12
Merge pull request #5815 from gsiv/fix/entrypoint-db 
server: Fix database config in Docker entrypoint
 2021-01-22 16:33:42 +01:00
Emanuel Schütze
97950d5baa
Merge pull request #5817 from FinnStutzenstein/debugging 
Performance improvements for OS3+
 2021-01-21 13:35:03 +01:00