Commit Graph

8307 Commits

Author SHA1 Message Date
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
Finn Stutzenstein
e30f4c85d8
Merge pull request #5912 from FinnStutzenstein/userTimestamp
Fix user last_email_send type
2021-02-22 07:58:20 +01:00
Finn Stutzenstein
1e194cf161
Fix user last_email_send type 2021-02-22 07:57:08 +01:00
Joshua Sangmeister
42b590c9f0 Add replacement to structured fields 2021-02-19 12:17:51 +01:00
Joshua Sangmeister
a427ca69fe Fix action interface 2021-02-19 09:26:44 +01:00
Ralf Peschke
f3086375cc Fix recommendations from code review 2021-02-18 16:49:21 +01:00
reiterl
21338d20c8
Merge pull request #5901 from reiterl/change_poll_global_defaults
Change poll global_* default to true.
2021-02-18 13:06:56 +01:00
Ralf Peschke
d413f04585 Proposal for permissions in initial-data.json 2021-02-18 11:08:08 +01:00
Ludwig Reiter
0a9b6f2a62 Change poll global_* default to true. 2021-02-17 11:16:18 +01:00
Finn Stutzenstein
0eaad10f11
Remodel the projector 2021-02-16 10:37:20 +01:00
Finn Stutzenstein
6e0dcf71df
Merge pull request #5858 from normanjaeckel/FixModelsvalidator
Fixed modelsvalidator.
2021-02-12 07:24:02 +01:00
Finn Stutzenstein
cf653fd151
Merge pull request #5880 from r-peschke/debug-port-for-backend
Map debug port for openslides-backend in docker-compose.dev
2021-02-10 14:38:07 +01:00
Finn Stutzenstein
4794f063f8
Merge pull request #5835 from reiterl/dev_check_json
Work on check_json.py
2021-02-10 13:32:32 +01:00
Finn Stutzenstein
cabba247f3
Reworked checker
Credits for initial work to @reiterl
2021-02-10 12:51:41 +01:00
Ralf Peschke
762a279d1b Map debug port for openslides-backend in docker-compose.dev 2021-02-10 11:23:46 +01:00
Norman Jäckel
11213125fc Fixed modelsvalidator. 2021-02-05 17:03:56 +01:00
Norman Jäckel
4b90c1b2ba
Merge pull request #5855 from normanjaeckel/Permission
Added permission.yml.
2021-02-05 14:03:21 +01:00
Norman Jäckel
d1d18c299a Added permission.yml. 2021-02-05 12:34:14 +01:00
Finn Stutzenstein
89498a12c4
Merge pull request #5831 from FinnStutzenstein/fixInitialData
Fix initial data
2021-02-04 16:07:48 +01:00
Finn Stutzenstein
aa07af5329
Merge pull request #5849 from GabrielInTheWorld/update-submodules
Update submodules
2021-02-04 15:56:19 +01:00
GabrielMeyer
fe6ce208e7 Update 2021-02-04 15:35:15 +01:00
Finn Stutzenstein
f41349f038
Merge pull request #5848 from jsangmeister/adjust-ds-interface
Adjust datastore interface
2021-02-04 13:49:41 +01:00
Joshua Sangmeister
21876d3be6 Adjust datastore interface 2021-02-04 13:43:14 +01:00
Finn Stutzenstein
1bee13d7e9
Merge pull request #5844 from OpenSlides/revert-5843-fixActionInterface
Revert "Fix action interface"
2021-02-03 10:07:10 +01:00
Finn Stutzenstein
f7ba41dd8f
Revert "Fix action interface" 2021-02-03 10:06:16 +01:00
Finn Stutzenstein
728cbdb719
Merge pull request #5843 from FinnStutzenstein/fixActionInterface
Fix action interface
2021-02-03 10:02:07 +01:00
Finn Stutzenstein
7f125165a3
Fix action interface 2021-02-03 10:00:53 +01:00
Finn Stutzenstein
aa934ecc1f
more fixes 2021-02-02 08:54:28 +01:00
Finn Stutzenstein
4107bbac80
Merge pull request #5836 from normanjaeckel/ChangeModelsYml
Added permissions to models.yml
2021-02-02 08:06:37 +01:00
Norman Jäckel
41956313b5 Added permissions to models.yml 2021-01-30 13:34:15 +01:00
Finn Stutzenstein
5d82a05608
Fix initial data 2021-01-28 13:36:11 +01:00
Finn Stutzenstein
7502569211
Merge pull request #5827 from FinnStutzenstein/update
update submodules
2021-01-27 12:41:31 +01:00
Finn Stutzenstein
2360665a6f
update submodules 2021-01-27 12:22:30 +01:00
Norman Jäckel
a949dc7006
Merge pull request #5802 from normanjaeckel/ChangedModelsForUsers
Added meeting specific fields for users.
2021-01-22 15:27:26 +01:00
Norman Jäckel
c6b1a254a0 Added meeting specific fields for users and changed role system. 2021-01-22 14:58:44 +01:00
jsangmeister
9abf787d99
Merge pull request #5704 from jsangmeister/datastore-partial-list-updates
Update datastore specs
2021-01-14 15:05:33 +01:00
Finn Stutzenstein
f0a4dc52d5
Merge pull request #5783 from reiterl/dev_model_config
Add config defaults to models.yml settings.
2021-01-14 08:54:57 +01:00
Ludwig Reiter
926e7482b1
Update defaults. 2021-01-14 08:53:24 +01:00
Ludwig Reiter
24b435bc46 Add config defaults to the settings in model.yml 2021-01-13 11:26:13 +01:00
Finn Stutzenstein
b825fb2a35
Merge pull request #5768 from FinnStutzenstein/updateDSInterface
Update Datastore interface
2021-01-12 16:25:58 +01:00
Finn Stutzenstein
0d2ce2cf29
Merge pull request #5809 from FinnStutzenstein/resources
Resources
2021-01-12 16:18:26 +01:00
Finn Stutzenstein
7c3e334677
Add default test resource 2021-01-12 16:17:06 +01:00
Joshua Sangmeister
5844eabb95 more docs & rename max_position 2021-01-12 14:58:35 +01:00