Commit Graph

7872 Commits

Author SHA1 Message Date
Joshua Sangmeister
8a36731d80 Removed redundant information from models.yml and adjusted validator 2020-12-17 10:30:15 +01:00
Finn Stutzenstein
253126723f
Merge pull request #5767 from FinnStutzenstein/update
Update Submodules
2020-12-10 12:02:33 +01:00
Finn Stutzenstein
a366c54afe
Update Submodules 2020-12-10 12:01:06 +01:00
Finn Stutzenstein
bbb355cc05
Merge pull request #5759 from FinnStutzenstein/updateMediafileInterface
Update mediaservice interface
2020-12-08 10:06:13 +01:00
Finn Stutzenstein
67f3312090
Update mediaservice interface 2020-12-08 10:05:00 +01:00
Finn Stutzenstein
b2909e0f1c
Merge pull request #5728 from reiterl/dev_model_number_value
Add number_value to motion model.
2020-12-08 08:39:17 +01:00
Finn Stutzenstein
cbe1a133f4
Merge pull request #5758 from FinnStutzenstein/fixExampleData
Fix example data
2020-12-08 08:37:34 +01:00
Finn Stutzenstein
9504f2fb73
Fix example data 2020-12-08 08:36:09 +01:00
Ludwig Reiter
8c59d1090c Update models.py
Add description and read_only to motion/number_value.
2020-12-07 14:31:08 +01:00
Finn Stutzenstein
09d0f740c2
Merge pull request #5756 from FinnStutzenstein/changeDocs
Change modellierung.drawio
2020-12-04 16:19:47 +01:00
Finn Stutzenstein
7f9f12e750
Change modellierung.drawio 2020-12-04 16:17:37 +01:00
Finn Stutzenstein
d983925930
Merge pull request #5753 from FinnStutzenstein/refinePolls
Refine poll modelling
2020-12-03 10:43:02 +01:00
Finn Stutzenstein
a8f097ded4
Refine poll modelling 2020-12-03 10:40:47 +01:00
Finn Stutzenstein
315bd7cdf3
Merge pull request #5696 from FinnStutzenstein/actionServiceInterface
Enhance the action interface
2020-12-01 14:37:43 +01:00
Finn Stutzenstein
a87901aee0
Merge pull request #5741 from FinnStutzenstein/models
Propagate changes in OS3
2020-12-01 13:54:35 +01:00
Finn Stutzenstein
9826e763af
Propagate changes in OS3 2020-12-01 13:45:29 +01:00
Finn Stutzenstein
4c1f7b123a
Merge pull request #5698 from FinnStutzenstein/pollRestructure
Restructure polls
2020-12-01 11:51:14 +01:00
Finn Stutzenstein
4f02a236b4
small changes 2020-11-27 10:47:02 +01:00
Ludwig Reiter
ed93d873a7 Add number_value to motion model. 2020-11-26 09:17:22 +01:00
Finn Stutzenstein
99b0bc6e3b
Restructure polls 2020-11-25 14:22:16 +01:00
Finn Stutzenstein
62f40d1447
move atomic parameter 2020-11-25 12:17:01 +01:00
Finn Stutzenstein
5019403a8e
Merge pull request #5722 from GabrielInTheWorld/new-compose
Deletes old docker-compose and adds a port to auth-service
2020-11-25 12:14:57 +01:00
GabrielMeyer
c62cc7851d Deletes old docker-compose and adds a port to auth-service 2020-11-24 16:38:07 +01:00
GabrielInTheWorld
b2215131a4
Merge pull request #5712 from GabrielInTheWorld/fix-example-data
Fixes missing meeting_id in example-data
2020-11-19 15:05:35 +01:00
GabrielMeyer
371fb0c6ae Fixes meeting_id example-data 2020-11-19 15:01:53 +01:00
Finn Stutzenstein
a0d0a4ac0b
Change name 2020-11-19 15:01:49 +01:00
Finn Stutzenstein
cb7e91d8c5
Fixed ActionsResult 2020-11-19 13:54:53 +01:00
Finn Stutzenstein
a73ae9961f
Include new transaction mode for bulk actions 2020-11-19 13:52:39 +01:00
jsangmeister
c3bb1928b9
Merge pull request #5708 from r-peschke/feature_setCommittee_Meeting_protected
Set relation Committee -> Meeting protected
2020-11-19 10:56:20 +01:00
Ralf Peschke
b39a2e397d Set relation Committee -> Meeting protected 2020-11-18 14:13:10 +01:00
Finn Stutzenstein
c48b5277c4
Merge pull request #5646 from FinnStutzenstein/permissionService
Permission service
2020-11-17 07:51:20 +01:00
fistutzenste
945d1307ba
Permission Service 2020-11-17 07:49:14 +01:00
Finn Stutzenstein
989a5789ef
Merge pull request #5699 from FinnStutzenstein/update
Update Services
2020-11-12 07:34:09 +01:00
Finn Stutzenstein
95aa94e4ea
Update Services 2020-11-12 07:32:18 +01:00
jsangmeister
7a039469b0
Merge pull request #5697 from reiterl/dev_model_group
Add on delete Protect to group relations.
2020-11-11 13:50:42 +01:00
Ludwig Reiter
2304729545 Add on delete Protect to group relations. 2020-11-11 10:22:59 +01:00
Finn Stutzenstein
8cfa7d0a51
Result->Response, actions->action 2020-11-11 08:33:59 +01:00
Finn Stutzenstein
5b0047b093
Enhance the action interface 2020-11-10 17:37:53 +01:00
jsangmeister
1fb296038e
Merge pull request #5679 from jsangmeister/protect-first-state-of-workflow
Protect first_state_of_workflow_id & rename has_inherited_access_group_ids
2020-11-05 17:40:31 +01:00
Joshua Sangmeister
ee41eb2df9 Protect first_state_of_workflow_id 2020-11-05 17:39:06 +01:00
jsangmeister
9c766de474
Merge pull request #5675 from reiterl/dev_model_lightblue
Add a default to motion_state css_class.
2020-11-04 16:03:39 +01:00
Ludwig Reiter
99011e6909 Add a default to motion_state css_class. 2020-11-04 14:53:57 +01:00
Finn Stutzenstein
c104f235da
Merge pull request #5670 from FinnStutzenstein/fixMediafileExampleData
Fix eaxmple data: Add LOS for mediafiles
2020-11-03 15:23:58 +01:00
Finn Stutzenstein
a183fa89cb
Fix eaxmple data: Add LOS for mediafiles 2020-11-03 15:22:24 +01:00
Finn Stutzenstein
0b6e855254
Merge pull request #5669 from FinnStutzenstein/locationToPlace
location -> place
2020-11-03 13:43:10 +01:00
Finn Stutzenstein
ef78783b55
location -> place 2020-11-03 13:41:45 +01:00
Finn Stutzenstein
ca069edb11
Merge pull request #5668 from FinnStutzenstein/structuredField
Structured fields, updated repos
2020-11-03 12:14:57 +01:00
Finn Stutzenstein
8bf3b3df6b
Structured fields, updated repos 2020-11-03 12:14:09 +01:00
jsangmeister
3e0ac15e49
Merge pull request #5662 from reiterl/dev_model_2
Update model assignment phase.
2020-10-30 10:33:59 +01:00
Ludwig Reiter
e199e9dbe0 Update model assignment. Change enum and default of phase. 2020-10-30 10:03:40 +01:00