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

8362 Commits

Author SHA1 Message Date
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
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