Finn Stutzenstein
fc3b498511
Mediaservice interface
2020-08-18 10:39:20 +02:00
Finn Stutzenstein
3fb41bf800
Merge pull request #5512 from FinnStutzenstein/update
...
Fix HaProxy redirection and client
2020-08-17 13:43:02 +02:00
Finn Stutzenstein
0993c25e66
Fix HaProxy redirection and client
2020-08-17 13:36:42 +02:00
Finn Stutzenstein
cb894c9d99
Merge pull request #5499 from FinnStutzenstein/moreCalculatedFields
...
Add calculated fields
2020-08-17 12:10:24 +02:00
Finn Stutzenstein
6ccf13bc6d
Merge pull request #5511 from FinnStutzenstein/update
...
Update Client and Auth service
2020-08-17 10:15:00 +02:00
Finn Stutzenstein
b312dc9297
Update Client and Auth service
2020-08-17 10:14:14 +02:00
Finn Stutzenstein
c86c3bdcbb
Merge pull request #5509 from tsiegleauq/slight-dev-docu-enhancement
...
Add https-info and enhance work-in-submodules doc
2020-08-14 11:16:00 +02:00
Finn Stutzenstein
ae2b73a8e5
Merge pull request #5510 from FinnStutzenstein/haproxy-redirect
...
Added redirect from http to https
2020-08-14 11:14:51 +02:00
Finn Stutzenstein
ff2569aba9
Added redirect from http to https
2020-08-14 11:13:56 +02:00
Sean Engelhardt
888e17369a
Add https-info and enhance work-in-submodules doc
2020-08-14 11:09:49 +02:00
Finn Stutzenstein
5e0eda112d
Adding motion recommendation extension references as relations
2020-08-11 15:14:11 +02:00
Finn Stutzenstein
37d3591d69
Add calculated fields
2020-08-11 09:25:31 +02:00
Finn Stutzenstein
27725a7694
Merge pull request #5493 from OpenSlides/fixModels
...
Fix syntax of models.txt
2020-08-03 15:54:01 +02:00
Oskar Hahn
cb0134a345
Fix syntax of models.txt
2020-08-03 15:19:03 +02:00
Finn Stutzenstein
8caf8e0c64
Merge pull request #5492 from FinnStutzenstein/fixExampleData
...
Fix example data II
2020-07-31 10:37:35 +02:00
fistutzenste
4fbf0a5438
Fix example data II
2020-07-31 10:36:20 +02:00
Finn Stutzenstein
51c27c4f12
Merge pull request #5491 from FinnStutzenstein/fixExampleData
...
Fix example data
2020-07-31 10:23:09 +02:00
fistutzenste
69ba33b117
Fix example data
2020-07-31 10:20:39 +02:00
Finn Stutzenstein
40fde015fc
Merge pull request #5490 from FinnStutzenstein/removeMkcert
...
Remove mkcert, update submodules
2020-07-31 09:23:19 +02:00
fistutzenste
3297e9c4e2
Remove mkcert, update submodules
2020-07-31 09:22:24 +02:00
Finn Stutzenstein
0671ca66c2
Merge pull request #5483 from FinnStutzenstein/fixDocs
...
Fix docs
2020-07-31 08:58:13 +02:00
Finn Stutzenstein
296a39929e
Merge pull request #5487 from FinnStutzenstein/smallerTimeouts
...
Smaller timeouts for HaProxy
2020-07-31 08:56:46 +02:00
FinnStutzenstein
584fe874ae
Fix docs and autoupdate interface
2020-07-30 09:09:09 +02:00
Finn Stutzenstein
c9223329cc
Merge pull request #5489 from FinnStutzenstein/includeMediaService
...
WIP: Adding media service
2020-07-29 15:58:53 +02:00
FinnStutzenstein
e518ef2784
WIP: Adding media service
2020-07-29 15:57:03 +02:00
Finn Stutzenstein
8c57d911a3
Merge pull request #5486 from GabrielInTheWorld/submodule-update
...
Submodule update backend
2020-07-29 08:35:40 +02:00
Finn Stutzenstein
6d2651650e
Merge pull request #5488 from GabrielInTheWorld/docker-setup
...
Fixes setup for auth-service
2020-07-28 14:25:29 +02:00
GabrielMeyer
6b6960c8fe
Fixes setup for auth-service
2020-07-28 14:23:28 +02:00
FinnStutzenstein
ded12bbea4
Smaller timeouts for HaProxy
...
This is needed to quickly detect the downage from a service. With these timeouts 12 seonds are needed for HaProxy to return an initial 503. All other 503 are instance since the service is not detected up again.
2020-07-28 10:49:09 +02:00
GabrielMeyer
b81da7c979
Submodule update backend
2020-07-27 12:02:00 +02:00
Finn Stutzenstein
a489742494
Merge pull request #5485 from swilde/openslides4-dev
...
If mkcert is not available, create certificates using openssl
2020-07-27 11:17:51 +02:00
Sascha Wilde
9bcffb08fb
If mkcert is not available, create certificates using openssl
2020-07-24 17:32:28 +02:00
Finn Stutzenstein
5d7dc56684
Merge pull request #5476 from FinnStutzenstein/https
...
Https
2020-07-24 10:59:37 +02:00
FinnStutzenstein
79ddac9da8
Use HTTPS in development mode
2020-07-24 10:58:39 +02:00
FinnStutzenstein
e47b5fff17
Merge branch 'update' into openslides4-dev
2020-07-23 12:16:59 +02:00
FinnStutzenstein
cd007b0950
Update images
2020-07-23 12:16:35 +02:00
Finn Stutzenstein
5086df63b0
Merge pull request #5481 from FinnStutzenstein/update
...
Update submodules
2020-07-22 16:22:33 +02:00
FinnStutzenstein
a17e88fa46
Update submodules
2020-07-22 16:21:46 +02:00
Finn Stutzenstein
708e176c2c
Merge pull request #5477 from FinnStutzenstein/schema
...
OS4 Schema: agenda items have tags
2020-07-22 13:29:28 +02:00
FinnStutzenstein
7d5cee923a
OS4 Schema: agenda items have tags
2020-07-17 08:38:55 +02:00
Finn Stutzenstein
846fb982f0
Merge pull request #5471 from tsiegleauq/ignore-more
...
Ignore venv
2020-07-17 07:04:54 +02:00
Sean
ce3446bbe5
Ignore venv
...
.virtualenv should be ignored since it might still exist
from openslides 3.
2020-07-16 15:10:57 +02:00
Finn Stutzenstein
357e54ec93
Merge pull request #5474 from FinnStutzenstein/update
...
Updated auth service
2020-07-15 16:54:35 +02:00
FinnStutzenstein
b6b041d0b6
Updated auth service
2020-07-15 16:54:01 +02:00
Finn Stutzenstein
06b520f3e6
Merge pull request #5466 from GabrielInTheWorld/add-auth-service
...
Adds submodule openslides-auth-service
2020-07-15 16:41:10 +02:00
GabrielMeyer
1f8e3d60e6
Adds submodule openslides-auth-service
2020-07-14 16:21:49 +02:00
Finn Stutzenstein
89f4323d11
Merge pull request #5460 from jsangmeister/update-models
...
Add new settings to meeting model
2020-07-09 12:53:00 +02:00
Joshua Sangmeister
bedbb75c69
Add new settings to meeting model
2020-07-09 12:46:54 +02:00
Finn Stutzenstein
64628e4be9
Merge pull request #5458 from jsangmeister/update-datastore
...
Update datastore commit & config
2020-07-09 12:38:14 +02:00
Joshua Sangmeister
7cc6d1fda2
Update autoupdate, backend, client
2020-07-09 11:56:00 +02:00
