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

8495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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