Commit Graph

8223 Commits

Author SHA1 Message Date
Ludwig Reiter
e199e9dbe0 Update model assignment. Change enum and default of phase. 2020-10-30 10:03:40 +01:00
Finn Stutzenstein
4d8a53513a
Merge pull request #5659 from FinnStutzenstein/fixDockerComposeDev
Fix docker compose dev
2020-10-28 13:17:52 +01:00
Finn Stutzenstein
c83d9cf806
Fix docker compose dev 2020-10-28 13:11:26 +01:00
Finn Stutzenstein
39d7353959
Merge pull request #5621 from FinnStutzenstein/prod
Productive setup
2020-10-28 10:42:42 +01:00
Finn Stutzenstein
9372386979
Prod setup 2020-10-28 08:46:03 +01:00
Finn Stutzenstein
399bf389d6
Merge pull request #5635 from FinnStutzenstein/dsHelperTools
Helper-tools for the DataStore
2020-10-23 08:32:03 +02:00
Finn Stutzenstein
4ff76444b2
Helper-tools for the DataStore 2020-10-23 08:31:20 +02:00
Finn Stutzenstein
1f049caf5d
Merge pull request #5650 from FinnStutzenstein/adoptExampleDataII
Adopt example data: Reenable the old version
2020-10-21 11:43:24 +02:00
Finn Stutzenstein
e164e2b118
Adopt example data: Reenable the old version
This can be reverted, if every service can deal with the new syntax
2020-10-21 11:41:56 +02:00
Finn Stutzenstein
ce5bb9dca5
Merge pull request #5649 from FinnStutzenstein/adoptExampleData
Adopt example data for new structured fields
2020-10-21 10:44:25 +02:00
Finn Stutzenstein
a406d5ac88
Adopt example data for new structured fields 2020-10-21 10:39:44 +02:00
Finn Stutzenstein
81c00368f0
Merge pull request #5648 from FinnStutzenstein/enableMotionFeatures
Enable more features for motions
2020-10-21 09:22:58 +02:00
Finn Stutzenstein
5439e46866
Enable more features for motions 2020-10-21 09:21:27 +02:00
Finn Stutzenstein
44cfc2849f
Merge pull request #5642 from reiterl/dev_model
Update model.yml to switch enum of state.
2020-10-20 10:08:53 +02:00
Ludwig Reiter
de65db33a7 Update model.yml to switch enum of state.
The motion_state css_class should include grey.
2020-10-20 09:35:29 +02:00
jsangmeister
b6dd6086aa
Merge pull request #5632 from jsangmeister/change-weights
Change weights and add defaults
2020-10-15 09:55:36 +02:00
Finn Stutzenstein
77c03b5675
Merge pull request #5630 from GabrielInTheWorld/update-auth-service-interface
Update auth-service's interface and auth-service
2020-10-14 07:55:58 +02:00
Joshua Sangmeister
2664c39361 Change weights and add defaults 2020-10-13 17:16:35 +02:00
GabrielMeyer
049421bda9 Update auth-service's interface and auth-service 2020-10-13 15:06:18 +02:00
Finn Stutzenstein
eded14f066
Merge pull request #5496 from GabrielInTheWorld/update-auth-service-interface
Update auth-service's interface
2020-10-13 08:26:15 +02:00
jsangmeister
27fdcc66d2
Merge pull request #5629 from jsangmeister/add-defaults
Add default type for motion_change_recommendation
2020-10-12 19:06:35 +02:00
Joshua Sangmeister
8530c87f77 Add default type for motion_change_recommendation 2020-10-12 19:02:26 +02:00
GabrielMeyer
d123f0934a Updates auth-service's interface
- Also updates `example-data.json` corresponding to OpenSlides/openslides-auth-service#32
2020-10-12 17:17:30 +02:00
jsangmeister
e9311083f2
Merge pull request #5620 from jsangmeister/add-on-delete
Add on_delete and meeting_id for all models
2020-10-12 16:20:07 +02:00
Joshua Sangmeister
064006474d Add on_delete, meeting_id and equal_fields 2020-10-12 15:13:01 +02:00
Finn Stutzenstein
9d52faaa6d
Merge pull request #5605 from FinnStutzenstein/models
OS4 Models: Add configuration and adopt schema changes in OS3
2020-10-12 14:46:20 +02:00
Finn Stutzenstein
2cc81c0168
OS4 Models: Add configuration and adopt schema changes in OS3 2020-10-12 14:39:12 +02:00
jsangmeister
3e655d3f12
Merge pull request #5626 from jsangmeister/add-default-agenda-item-type
Add default type to agenda item
2020-10-12 11:54:28 +02:00
Joshua Sangmeister
f511b2f722 Add default type to agenda item 2020-10-12 11:48:23 +02:00
jsangmeister
c83a82337b
Merge pull request #5612 from jsangmeister/fix-html-permissive
Fix typo
2020-10-08 09:31:14 +02:00
Joshua Sangmeister
b311525b7d Fix typo 2020-10-08 09:27:04 +02:00
Finn Stutzenstein
31d6f93033
Merge pull request #5619 from FinnStutzenstein/update
Update services
2020-10-08 09:11:26 +02:00
Finn Stutzenstein
1891cc7e0b
Update services 2020-10-08 08:29:04 +02:00
Finn Stutzenstein
08b4f023cc
Merge pull request #5615 from GabrielInTheWorld/update-auth-service
Updates auth-service
2020-10-08 07:41:49 +02:00
GabrielMeyer
3971404764 Updates auth-service 2020-10-07 12:02:50 +02:00
jsangmeister
34dcb91744
Merge pull request #5593 from jsangmeister/adjust-models-yml
Adjust models.yml
2020-10-06 15:14:47 +02:00
Joshua Sangmeister
ba03281c17 Adjust models.yml 2020-10-06 15:12:10 +02:00
Norman Jäckel
a7248c2399
Merge pull request #5578 from FinnStutzenstein/updateModels
Update models
2020-10-02 09:04:41 +02:00
Finn Stutzenstein
248a0451df
Add topic to projected collections 2020-10-02 08:13:45 +02:00
Norman Jäckel
3b4a006754
Merge pull request #5589 from ostcar/modelsvalidate-version
Use a specific version of the modelsvalidater to make build reproducable
2020-10-01 21:10:21 +02:00
Oskar Hahn
bd7e6b95cb Use a specific version of the modelsvalidater to make build reproducable 2020-09-30 20:15:07 +02:00
Norman Jäckel
2a479746cd
Merge pull request #5587 from normanjaeckel/FixBranch
Fix branch.
2020-09-30 20:11:39 +02:00
Norman Jäckel
5b6f6b50c1 Added through keyword for nested structured relations. 2020-09-29 23:24:12 +02:00
Norman Jäckel
a4ed281c7e Fix branch. 2020-09-29 22:56:03 +02:00
Norman Jäckel
e9fd1f108b
Merge pull request #5572 from normanjaeckel/modelsToYML
Models to yml
2020-09-29 22:49:03 +02:00
Norman Jäckel
e80f7eb5e4 Added required flag and other properties to some models. 2020-09-29 22:43:39 +02:00
Finn Stutzenstein
49c77912ae
Merge pull request #5576 from jsangmeister/fix-example-data
Fix example data
2020-09-28 11:49:24 +02:00
Finn Stutzenstein
b2eab8306e
Merge pull request #5558 from reiterl/dev1
Add calculated to motion_category/level field.
2020-09-28 10:45:24 +02:00
Joshua Sangmeister
9c6bb8ab7f Fix example data 2020-09-24 17:40:09 +02:00
GabrielInTheWorld
8ced3e0f38
Merge pull request #5573 from jsangmeister/fix-example-data
Fix example data & add direct db access script
2020-09-22 11:36:18 +02:00