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

8259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Emanuel Schütze
e9d0c07eb4
Merge pull request #6271 from emanuelschuetze/updateServices 
Updated services
 2021-11-04 16:33:47 +01:00
Emanuel Schütze
8a0fd4473c Updated services 2021-11-04 10:59:15 +01:00
Ralf Peschke
7a679dc530 Remove omitted workflows 2021-11-03 13:30:24 +01:00
Ralf Peschke
34eb57a31d
Merge pull request #6265 from r-peschke/BAIssue678_smtp-server 
ClientIssue553: Add Testmailserver to openslides-dev-setup
 2021-11-02 17:23:08 +01:00
Ralf Peschke
60e4e537f8 Remove caddy volume 2021-11-02 17:03:05 +01:00
Ralf Peschke
8c6edaf4b0 BAIssue1008: models.yml etc. deleted from repo 2021-11-01 18:51:58 +01:00
Ralf Peschke
912fafcca3 ClientIssue553: Add Testmailserver to openslides-dev-setup 2021-10-29 16:46:15 +02:00
reiterl
b7263f0c3c
Merge pull request #6269 from reiterl/rename_in_progress 
Rename one motion_state in initial/example data.
 2021-10-29 10:18:04 +02:00
Ludwig Reiter
60d266789e Use newest backend. 2021-10-28 15:17:23 +02:00
Ludwig Reiter
95e48b05c2 Rename one motion_state in initial/example data. 2021-10-28 15:10:47 +02:00
reiterl
4430f0560a
Merge pull request #6268 from reiterl/limit_of_users 
Add field limit_of_users to organization.
 2021-10-28 14:29:31 +02:00
Ludwig Reiter
2ec3ad19a2 Change md5sum of initial data. 2021-10-28 14:11:15 +02:00
Ludwig Reiter
b97b0de412 Add field limit_of_users to organization. 2021-10-28 14:08:36 +02:00
GabrielInTheWorld
cd3dfb4229
Merge pull request #6267 from GabrielInTheWorld/of-initial-themes 
Adds the openslides-red and -green theme to the initial data
 2021-10-28 08:34:07 +02:00
GabrielInTheWorld
89b8422361 Adds the openslides-red and -green theme to the initial data 2021-10-27 12:18:07 +02:00
peb-adr
bad1e131ee
Merge pull request #6261 from peb-adr/proxy-rework 
Proxy rework
 2021-10-25 14:59:31 +02:00
Adrian Richter
4d02165f1f add auto https support + manage router by header 
switch from caddy file to native json
 2021-10-25 12:58:32 +02:00
Ralf Peschke
4fc44929f8
Merge pull request #6255 from r-peschke/pull_req6246_req_true_fields 
PR6246 mediafile.list_of_speakers not required, because of directories
 2021-10-19 10:38:01 +02:00
Ralf Peschke
e622822a3f - set mediafle.list_of_speakers required=false 
- use submodule backend with generated models.py
- fix bug initial-data.json MI5 -> Mi7, because file data represents MI7
 2021-10-19 10:18:35 +02:00
Ralf Peschke
30e978d288 Revert "PR6246 mediafile.list_of_speakers not required, because of directories" 
This reverts commit 851e54077f.
 2021-10-19 09:57:02 +02:00
Ralf Peschke
851e54077f PR6246 mediafile.list_of_speakers not required, because of directories 2021-10-18 19:34:01 +02:00
Emanuel Schütze
772e3a391f
Merge pull request #6253 from emanuelschuetze/update-20211014 
Updated services
 2021-10-14 22:38:11 +02:00
Emanuel Schütze
29f1a3b86d Updated services 2021-10-14 22:18:08 +02:00
reiterl
d97e97186b
Merge pull request #6242 from reiterl/themes_collection 
Add theme collection to models.
 2021-10-12 11:02:50 +02:00
Ludwig Reiter
dc2998b0ea Update initial-data md5sum. 2021-10-12 10:39:41 +02:00
Emanuel Schütze
b5eece6052
Merge pull request #6248 from emanuelschuetze/update20211009 
Updated services
 2021-10-09 21:21:23 +02:00
Emanuel Schütze
53db1caa39 Updated services 2021-10-09 12:07:22 +02:00
Emanuel Schütze
b21d76c882
Merge pull request #6246 from ostcar/requied_relations 
Set required attribute on relation and generic-relation fields
 2021-10-08 20:32:04 +02:00
Oskar Hahn
94cb1a47d2 Set required attribute on relation and 
generic-relation fields
 2021-10-08 17:14:14 +02:00
Ludwig Reiter
97056e9f2a Add missing options to theme. 2021-10-08 09:15:10 +02:00
Ludwig Reiter
285b900b5a Rename default_theme_id into theme_id 
And update initial and example data.
 2021-10-08 09:15:09 +02:00
Ludwig Reiter
fdfe3bd66a Add required to default_theme_id and organization_id. 2021-10-08 09:15:09 +02:00
Ludwig Reiter
ee3b84abde Add one theme to initial/example data. 2021-10-08 09:15:09 +02:00
Ludwig Reiter
e2382a7c86 Fix indentation of initial-data.json 2021-10-08 09:15:09 +02:00