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

8293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
fa0fa370d6
Added LABELS to proxy's Dockerfile. (#6323) 2022-01-07 20:12:51 +00:00
Emanuel Schütze
b8e01143ba
Merge pull request #6324 from emanuelschuetze/update-20220107 
Updated services
 2022-01-07 20:49:18 +01:00
Emanuel Schütze
504b620a40 Updated services 2022-01-07 20:21:11 +01:00
Emanuel Schütze
b4bee3483f
Merge pull request #6320 from emanuelschuetze/update20220106 
updated services
 2022-01-06 23:59:58 +01:00
Emanuel Schütze
51bfd49aa5 updated services 2022-01-06 23:38:44 +01:00
Emanuel Schütze
d75d11a511
Merge pull request #6319 from emanuelschuetze/update-20220106 
Updated services
 2022-01-06 16:09:20 +01:00
Emanuel Schütze
0e18053510 Updated services 2022-01-06 15:50:56 +01:00
Emanuel Schütze
f0bff0a754
Merge pull request #6316 from gsiv/update-buildsh 
docker/build.sh: Add ICC and voting service
 2022-01-06 15:45:33 +01:00
peb-adr
3ecbd356dc
Merge pull request #6315 from peb-adr/proxy-ahosts 
proxy: add ALLOWED_HOSTS env var
 2022-01-06 12:41:09 +01:00
Gernot Schulz
c841f817b2 docker/build.sh: Add ICC and voting service 2021-12-28 13:45:37 +01:00
root
ba74f33e68 proxy: add ALLOWED_HOSTS env var 
will setup caddy to check if the Host-header matches one of the space
delimited fields in ALLOWED_HOSTS. Or do no such thing if ALLOWED_HOSTS
is not set.
 2021-12-22 12:42:46 +01:00
Emanuel Schütze
b2741c782e
Merge pull request #6313 from emanuelschuetze/update-20211210 
Updated services
 2021-12-10 18:50:36 +01:00
Emanuel Schütze
a3455c3981 Updated services 2021-12-10 18:18:52 +01:00
Norman Jäckel
51c72c543c
Merge pull request #6309 from peb-adr/local-prod 
add local production setup
 2021-12-10 16:34:08 +01:00
Emanuel Schütze
8a325e1569
Merge pull request #6312 from emanuelschuetze/services-to-master 
Updated services-to-master script
 2021-12-10 15:54:11 +01:00
Adrian Richter
26ef35f72e add local production setup 2021-12-10 12:45:06 +01:00
Emanuel Schütze
1241a651c6 Updated services-to-master script 2021-12-10 12:44:13 +01:00
GabrielInTheWorld
95504ce8c0
Merge pull request #6310 from GabrielInTheWorld/dev 
Improves the 'services-to-master' function
 2021-12-10 10:20:16 +01:00
GabrielInTheWorld
29edcc18f0 Improves the 'services-to-master' function 2021-12-09 16:23:36 +01:00
Emanuel Schütze
74f4f2dfbd
Merge pull request #6307 from emanuelschuetze/update-20211208 
Updated services
 2021-12-08 17:12:58 +01:00
Emanuel Schütze
119576f4a5 Updated services 2021-12-08 16:23:33 +01:00
Emanuel Schütze
eb79dd9aca
Merge pull request #6305 from tsiegleauq/fix-icc-integration 
Fix ICC integration
 2021-12-07 20:14:58 +01:00
Sean
44e9c99eb3 Fix ICC integration 
Updates the ICC Service
Changes the ICC port to 9007
Adjust the proxy
Adjust services.env
 2021-12-07 17:47:09 +01:00
Emanuel Schütze
396dc75961
Merge pull request #6303 from GabrielInTheWorld/new-service-to-master 
Automatically checkout the latest commit for every submodule
 2021-12-07 16:43:30 +01:00
GabrielInTheWorld
9809eb029c Automatically checkout the latest commit for every submodule 
Adds a new script "services-to-master.sh" and updates the Makefile
 2021-12-02 15:17:14 +01:00
Emanuel Schütze
fd3371dd0b
Merge pull request #6302 from emanuelschuetze/update20211201 
Updated services
 2021-12-02 12:09:16 +01:00
Emanuel Schütze
5762c4a9a0 Updated services 2021-12-02 11:49:02 +01:00
Emanuel Schütze
3d56027ae4
Update README.md 2021-11-30 22:03:19 +01:00
Emanuel Schütze
845f8c5676
Merge pull request #6297 from emanuelschuetze/update-serices20211125 
Updated services
 2021-11-25 23:00:12 +01:00
Emanuel Schütze
003acc1b78 Updated services 2021-11-25 20:29:43 +01:00
Sean
f4e3257d88
Merge pull request #6293 from tsiegleauq/cypress-integration-no-docker 
Run cypress workflow without docker
 2021-11-24 11:30:11 +01:00
Sean
fe163c809d
Merge pull request #6288 from ostcar/vote-volumes 
Add volumes to vote-dev-environment
 2021-11-24 10:57:24 +01:00
Sean
693e116222 Run cypress workflow without docker 
Runs the cypress workflow directly without docker
 2021-11-23 22:47:49 +01:00
Sean
3adea03883
Merge pull request #6291 from tsiegleauq/remove-announce-workflow 
Remove GHActions to announce file changes
 2021-11-23 10:58:57 +01:00
Sean
12308fbe3c Remove GHActions to announce file changes 
Removes the GHActions that would create issues when files change.
The files in question were moved to the backend-repo
 2021-11-23 10:31:32 +01:00
Sean
597da01430
Merge pull request #6290 from peb-adr/actions-build-vote 
add vote-service to build-images workflow
 2021-11-22 17:14:21 +01:00
Adrian Richter
d77a14d233 add vote-service to build-images workflow 2021-11-22 15:54:09 +01:00
GabrielInTheWorld
0ab17c3597
Merge pull request #6284 from peb-adr/fix-proxy-dev 
fix missing caddy_base when rebuilding
 2021-11-22 11:58:31 +01:00
peb-adr
004ff453bc
Merge branch 'master' into fix-proxy-dev 2021-11-22 11:00:06 +01:00
Oskar Hahn
77dac78d88 Add volumes to vote-dev-environment 
needed for auto reload
 2021-11-19 19:53:15 +01:00
Emanuel Schütze
77d672544c
Merge pull request #6286 from emanuelschuetze/update-20211118 
Updated services
 2021-11-18 20:23:46 +01:00
Emanuel Schütze
df08720d0e Updated services 2021-11-18 17:53:59 +01:00
GabrielInTheWorld
e0b2679941
Merge pull request #6274 from tsiegleauq/add-vote-service 
Add vote service to OS4 setup
 2021-11-18 14:56:36 +01:00
Sean Engelhardt
6846b2ab91 Add vote service to OS4 setup 
Integrate vote service, makes according changes to configuration
Updates the client to integrate the vote service
Updates the backend to integrate the vote service
 2021-11-17 23:32:40 +01:00
Adrian Richter
3dabed8667 fix missing caddy_base when rebuilding 2021-11-17 17:57:34 +01:00
Sean
67a82de70c
Merge pull request #6281 from GabrielInTheWorld/new-dev-setup 
Change the initial data
 2021-11-15 15:04:47 +01:00
GabrielInTheWorld
bed69cf9d2 Change the initial data 2021-11-15 14:40:03 +01:00
Sean
3b798b8ce8
Merge pull request #6275 from peb-adr/https 
make local cert file location adjustable
 2021-11-11 15:46:36 +01:00
Adrian Richter
84d38dc553 make local cert file location adjustable 2021-11-11 15:17:38 +01:00
Ralf Peschke
a100ff22b1
Issue1008 Backend: models.yml etc. moved to backend, remove omitted workflows 2021-11-11 14:37:39 +01:00