Commit Graph

8230 Commits

Author SHA1 Message Date
Joshua Sangmeister
ae8951ee82 Fix typos 2021-05-11 10:16:16 +02:00
jsangmeister
862bc8c182
Merge pull request #6052 from jsangmeister/fix-models
Fix models
2021-05-10 12:49:39 +02:00
Joshua Sangmeister
24e0771d05 Fix models.yml 2021-05-06 09:10:04 +02:00
Finn Stutzenstein
50fdaca46f
Merge pull request #6029 from FinnStutzenstein/remodelUsers
Remodel users
2021-05-03 14:01:19 +02:00
Norman Jäckel
e99eb0bf0b Review 2021-05-01 11:15:03 +02:00
Norman Jäckel
b4a034d900 Switched to GitHub Container Registry. 2021-04-30 13:54:05 +02:00
Norman Jäckel
e9357b2c10 New production setup with Docker Compose
Updated openslides-manage-service and changed README.md

Added GitHub workflow.
2021-04-30 00:41:04 +02:00
Finn Stutzenstein
be883f2a0d
Remodel users 2021-04-29 14:29:08 +02:00
Finn Stutzenstein
2fd4160aaa
Merge pull request #6041 from FinnStutzenstein/os4-pro-contra-note
Pro/contra/marked/note for OS4
2021-04-29 14:12:13 +02:00
Finn Stutzenstein
4c10007bab
example- and initial data 2021-04-29 14:09:21 +02:00
Finn Stutzenstein
e2c7287812
Pro/contra/marked/note for OS4 2021-04-29 12:00:53 +02:00
Finn Stutzenstein
09ba505277
Merge pull request #6039 from FinnStutzenstein/revert-6032
Revert updating manageservice
2021-04-29 08:05:33 +02:00
Finn Stutzenstein
eaef28029b
Revert updating manageservice
It breaks the deployment
2021-04-29 08:03:38 +02:00
GabrielInTheWorld
9efb47f2a5
Merge pull request #6032 from GabrielInTheWorld/update-subprojects
Update subprojects to their current master
2021-04-27 10:10:21 +02:00
GabrielMeyer
dbe74308b7 Update subprojects to current master 2021-04-26 16:36:27 +02:00
Finn Stutzenstein
60cae02ec7
Merge pull request #6016 from FinnStutzenstein/pollBackend
poll backend
2021-04-26 07:20:48 +02:00
jsangmeister
25d8f88ea0
Merge pull request #6018 from jsangmeister/locked-fields-as-list
Change locked fields to a list
2021-04-22 15:31:44 +02:00
Joshua Sangmeister
595a3fea90 Make change non-breaking 2021-04-22 12:23:16 +02:00
Joshua Sangmeister
6ca37f8067 Lock CollectionField with array 2021-04-22 09:33:20 +02:00
Finn Stutzenstein
5fff49e336
poll backend 2021-04-19 09:22:55 +02:00
Finn Stutzenstein
d216e3121f
Merge pull request #6013 from FinnStutzenstein/update
Update submodules
2021-04-15 16:24:40 +02:00
Finn Stutzenstein
6eccda1217
Update submodules 2021-04-15 16:19:11 +02:00
jsangmeister
f703a77796
Merge pull request #6012 from jsangmeister/make-countdown-times-required
Make countdown times required
2021-04-15 11:27:27 +02:00
jsangmeister
1e141bda0c
Merge pull request #6011 from r-peschke/issue473_meeting_reference_projector_id_required
Issue473 meeting.reference projector id and user.username required
2021-04-15 11:27:20 +02:00
Joshua Sangmeister
178df37536 Make countdown times required 2021-04-15 10:39:04 +02:00
Ralf Peschke
29304f34f2 User.username also required 2021-04-14 15:29:28 +02:00
Ralf Peschke
dea8e98e28 issue473_required_for_meeting.reference_projector_id 2021-04-14 13:45:51 +02:00
Finn Stutzenstein
097230b66e
Merge pull request #6000 from FinnStutzenstein/organisation_tags
Add organisation tags
2021-04-08 14:34:21 +02:00
Finn Stutzenstein
2b7124760d
Add organisation tags 2021-04-08 13:47:31 +02:00
Finn Stutzenstein
2c4c33dac1
Merge pull request #5999 from FinnStutzenstein/prod
OS4 productive setup changes
2021-04-08 12:54:48 +02:00
Finn Stutzenstein
79a14e15ad
OS4 productive setup changes
Now uses secrets and add the possibility to enable electronic voting
2021-04-08 12:52:59 +02:00
jsangmeister
bb1ac2fc96
Merge pull request #5993 from jsangmeister/voting-changes
Adapt models.yml to new voting changes
2021-04-08 09:36:48 +02:00
Joshua Sangmeister
3eee3c1c37 Adapt example data 2021-04-06 11:20:47 +02:00
Joshua Sangmeister
df7c25cc5d Adapt models.yml to new voting changes 2021-04-06 11:01:51 +02:00
Finn Stutzenstein
4088913d7d
Merge pull request #5988 from FinnStutzenstein/prod
OS4 Prod with swarm mode
2021-04-01 10:56:30 +02:00
Finn Stutzenstein
ae406a3979
OS4: prod setup 2021-04-01 10:55:06 +02:00
Oskar Hahn
00924d45d0
Merge pull request #5983 from ostcar/fix_example_projection
Fix projection name in example data
2021-03-28 16:48:28 +02:00
Oskar Hahn
353c2cb50d Fix projection name in example data 2021-03-28 16:42:59 +02:00
Finn Stutzenstein
68c3e140e7
Merge pull request #5747 from GabrielInTheWorld/update-auth-service-interface
Update auth-service's interface
2021-03-22 13:57:52 +01:00
reiterl
c703b29df0
Merge pull request #5973 from reiterl/model_poll_defaults
Update poll onehundred_percent_base and majority_method defaults.
2021-03-19 14:44:36 +01:00
Ludwig Reiter
787419911b Update poll onehundred_percent_base and majority_method defaults. 2021-03-19 14:42:31 +01:00
Finn Stutzenstein
471eec07fe
Merge pull request #5965 from reiterl/model_default_time
Remove default from projector_countdown/default_time.
2021-03-18 13:39:16 +01:00
Ludwig Reiter
ccc77d8ea6 Remove default from projector_countdown/default_time. 2021-03-18 13:36:02 +01:00
Finn Stutzenstein
903764565c
Merge pull request #5958 from FinnStutzenstein/updateAndCaddy
Update submodules and use Caddy
2021-03-18 13:26:25 +01:00
Finn Stutzenstein
2b34a3ffc2
Update submodules and use Caddy 2021-03-18 13:25:12 +01:00
jsangmeister
89e8a5b565
Merge pull request #5963 from jsangmeister/css-class-required
Make css_class required
2021-03-18 11:53:28 +01:00
Joshua Sangmeister
be08de3858 Make css_class required 2021-03-18 11:51:03 +01:00
Finn Stutzenstein
a530fef898
Merge pull request #5962 from FinnStutzenstein/update
Update submodules
2021-03-18 08:49:14 +01:00
Finn Stutzenstein
471ea30171
Update submodules 2021-03-18 08:47:45 +01:00
Finn Stutzenstein
29beab391d
Merge pull request #5960 from reiterl/models_poll_globals
Change poll global default to false.
2021-03-18 07:31:04 +01:00