Commit Graph

8299 Commits

Author SHA1 Message Date
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
Ludwig Reiter
f42dea91bf Change poll global default to false. 2021-03-17 11:46:43 +01:00
Oskar Hahn
737eeeca2f
Merge pull request #5956 from ostcar/manage-service
Add manage service
2021-03-15 10:46:11 +01:00
Oskar Hahn
5af507ea82 Fix docker-compose 2021-03-13 12:50:07 +01:00
Oskar Hahn
1a965b9034 Add manage service 2021-03-13 10:31:54 +01:00
Finn Stutzenstein
4a5c356c08
Merge pull request #5950 from jsangmeister/add-speaker-equal-fields
Add equal_fields for speaker
2021-03-11 16:10:21 +01:00
Joshua Sangmeister
b62728c998 Add equal_fields for speaker 2021-03-11 15:28:19 +01:00
Finn Stutzenstein
33fda8788c
Merge pull request #5949 from FinnStutzenstein/losInitialClosed
List of speaker initially closed
2021-03-11 09:04:00 +01:00
Finn Stutzenstein
c8e040348f
List of speaker initially closed 2021-03-11 08:59:30 +01:00
Finn Stutzenstein
41572f41cf
Merge pull request #5947 from r-peschke/issue474_N_as_new_100_percent_base
N as new 100% base
2021-03-11 07:47:15 +01:00
Ralf Peschke
82d6c43499 N as new 100% base 2021-03-09 11:45:49 +01:00
Finn Stutzenstein
1f780c0926
Merge pull request #5945 from FinnStutzenstein/updateModels
Add default_vote_weight default
2021-03-08 14:24:32 +01:00
Finn Stutzenstein
448fab6ead
Add default_vote_weight default 2021-03-08 14:22:16 +01:00
Finn Stutzenstein
9f036fe437
Merge pull request #5944 from FinnStutzenstein/updateModels
Add default countdowns
2021-03-08 14:09:14 +01:00
Finn Stutzenstein
f833b61c9b
Add default countdowns 2021-03-08 14:08:15 +01:00
Finn Stutzenstein
91b9bc6461
Merge pull request #5917 from FinnStutzenstein/projectorContentObjects
Update projector_countdown
2021-03-08 12:17:07 +01:00
Finn Stutzenstein
0a3d511322
Merge pull request #5925 from FinnStutzenstein/models
Adjusted models
2021-03-08 12:00:44 +01:00
Finn Stutzenstein
aa77b878c2
Merge pull request #5942 from FinnStutzenstein/updateModels
Add defaults for closed on agenda item and list of speakers
2021-03-08 11:35:07 +01:00
Finn Stutzenstein
0a4e580274
Add defaults for closed on agenda item and list of speakers 2021-03-08 11:33:21 +01:00
Finn Stutzenstein
aa05abcb0e
Merge pull request #5934 from r-peschke/mediafile_without_2_required_fields
mediafile fields list_of_speakers_id and filename not required
2021-03-04 07:58:54 +01:00
Ralf Peschke
fa80e7dfac mediafile fields list_of_speakers_id and filename not required anymore because of mediafile directory 2021-03-03 17:26:26 +01:00
Finn Stutzenstein
f5529f5eb3
Adjusted models
- Added new permissions poll.can_manage
- Reorder permissions.yml alphabetically
- provide some more default values
2021-03-01 11:41:25 +01:00
Finn Stutzenstein
d293832199
Merge pull request #5919 from jsangmeister/fix-action-interface2
Fix action interface2
2021-03-01 07:22:49 +01:00
Joshua Sangmeister
0583f05a4f Switch atomic meaning 2021-02-26 15:04:24 +01:00
jsangmeister
5aad7e87b6
Merge pull request #5907 from jsangmeister/fix-structured-fields
Add replacement to structured fields
2021-02-26 14:50:13 +01:00
jsangmeister
cf349840fc
Merge pull request #5906 from jsangmeister/fix-action-interface
Fix action interface
2021-02-26 12:39:06 +01:00
Finn Stutzenstein
41af863484
Update projector_countdown 2021-02-25 11:03:36 +01:00
Finn Stutzenstein
36125dadc5
Merge pull request #5914 from r-peschke/openslides4-dev
Add 'minimum' for some fields in Projector
2021-02-23 15:56:29 +01:00
Ralf Peschke
56c8b1c15c
Add 'minimum' for some fields in Projector 2021-02-23 15:48:15 +01:00
Ralf Peschke
d127541e24
Merge pull request #5904 from r-peschke/os4-permissions-in_initial-data.json
Permissions in initial-data.json and example-data.json concording to those in models.yaml
2021-02-22 11:47:21 +01:00
Ralf Peschke
9f6ad59d0b PR5904 Fix permissions initial_data.jsoin and example-data.json 2021-02-22 11:42:47 +01:00
Finn Stutzenstein
f0a5e2716a
Merge pull request #5900 from FinnStutzenstein/projector
Remodel the projector
2021-02-22 08:03:43 +01:00