Commit Graph

8079 Commits

Author SHA1 Message Date
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
Finn Stutzenstein
08691f3a1f Update Datastore interface
Add new locked field syntax
2021-01-12 14:58:32 +01:00
Finn Stutzenstein
118876dcc1
Merge pull request #5808 from FinnStutzenstein/update
update OS4 submodules
2021-01-12 09:58:08 +01:00
Finn Stutzenstein
c9f14d8b78
update OS4 submodules 2021-01-12 09:56:57 +01:00
Finn Stutzenstein
62cc57c54b
Merge pull request #5723 from FinnStutzenstein/categoryPrefixOptional
Change the category prefix to optional
2021-01-12 08:40:51 +01:00
Finn Stutzenstein
7854487e4f
Merge pull request #5803 from tsiegleauq/adjust-initial-data
Update initial data
2021-01-12 08:37:54 +01:00
GabrielInTheWorld
29e79eefb4
Merge pull request #5806 from GabrielInTheWorld/fix-auth-environment
Updates environment for autoupdate
2021-01-11 15:54:44 +01:00
GabrielMeyer
4d2ba5447a Updates environment for autoupdate 2021-01-11 14:47:47 +01:00
Sean
fecec21a0f Update initial data
update initial data to new naming
2021-01-08 15:11:24 +01:00
Oskar Hahn
f2f9000dec
Merge pull request #5798 from ostcar/permission-interface
permission interface
2021-01-08 09:40:54 +01:00
Finn Stutzenstein
5098d71891
Merge pull request #5799 from FinnStutzenstein/update
Updating submodules
2021-01-07 17:31:51 +01:00
Finn Stutzenstein
3a3ac21e8a
Updating submodules 2021-01-07 17:30:39 +01:00
Oskar Hahn
91f2360550 permission interface 2021-01-07 17:28:16 +01:00
Oskar Hahn
14ae5736d2
Merge pull request #5792 from ostcar/example_data_permission_rename
Example data permission rename
2021-01-07 17:02:42 +01:00
Oskar Hahn
ec9cdfc7a9 Fix permissions in example data
rename superadmin to admin

Rename user perm

enum values to strings

step

internal_item
2021-01-07 17:00:38 +01:00
Finn Stutzenstein
45289663c5
Merge pull request #5790 from ostcar/models-changes
models.yml: More clear enums
2021-01-07 16:52:19 +01:00
Norman Jäckel
2399414a4f
Merge pull request #5794 from normanjaeckel/Docs
Docs
2021-01-07 16:49:11 +01:00
Oskar Hahn
a1702b0b8d Remove supporters autoremove 2021-01-07 16:46:21 +01:00
Finn Stutzenstein
6db4f68136
Merge pull request #5796 from FinnStutzenstein/gitignore
Add OS3 secrets to gitignore
2021-01-07 09:19:03 +01:00
Finn Stutzenstein
1ad58c503c
Add OS3 secrets to gitignore 2021-01-07 09:17:33 +01:00
Norman Jäckel
b85a981dfe Added some descriptions. 2021-01-06 20:28:35 +01:00
Oskar Hahn
3c50e18cb3
Merge pull request #5793 from ostcar/modelsvalidate_external_lib
Use openslides-models-to-go
2021-01-06 11:39:21 +01:00
Oskar Hahn
98c2f5c332 Use openslides-models-to-go 2021-01-06 11:32:16 +01:00
Finn Stutzenstein
c2e46afbd1
Merge pull request #5785 from reiterl/dev_model_supporter
Remove equal_fields meetings from supporter_ids.
2021-01-05 08:11:03 +01:00
Oskar Hahn
2504fbb307 Rename meeting superadmin to just admin 2021-01-04 15:46:22 +01:00
Oskar Hahn
1c5b4a5c9e More clear enums 2021-01-02 21:30:28 +01:00
Ludwig Reiter
a8a5890d20 Remove equal_fields meetings from supporter_ids. 2020-12-18 11:36:50 +01:00
jsangmeister
a3dce30e1d
Merge pull request #5776 from reiterl/dev_model_rm_option
Remove allow_multiple_votes_per_candidate
2020-12-17 15:22:01 +01:00
jsangmeister
d224571373
Merge pull request #5782 from jsangmeister/fix-models
Fix models
2020-12-17 11:03:22 +01:00