Commit Graph

7798 Commits

Author SHA1 Message Date
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
Joshua Sangmeister
3b0df8de45 Fix example data & add direct db access script 2020-09-22 11:34:21 +02:00
Norman Jäckel
a1925e87f3 Updated models.yml. Added GitHub action with validator. 2020-09-20 22:21:23 +02:00
Oskar Hahn
c1b9de6e81 Added models.yml 2020-09-19 20:44:30 +02:00
jsangmeister
3dbc854d81
Merge pull request #5560 from jsangmeister/update-auth-backend
Update auth service and backend
2020-09-15 13:50:39 +02:00
Joshua Sangmeister
00eafb93b9 Update auth service and backend 2020-09-15 13:48:12 +02:00
Ludwig Reiter
4ea247a3f6 Add calculated to motion_category/level field. 2020-09-14 09:45:56 +02:00
Finn Stutzenstein
7e6ab82f8e
Merge pull request #5552 from FinnStutzenstein/updateModels
Update models.txt
2020-09-09 08:38:59 +02:00
Finn Stutzenstein
de1cebae26
Update models.txt 2020-09-09 08:38:22 +02:00
Finn Stutzenstein
94219feb44
Merge pull request #5513 from FinnStutzenstein/media-interface
Mediaservice interface
2020-09-01 08:07:15 +02:00
Finn Stutzenstein
e0df72bb06
Merge pull request #5527 from FinnStutzenstein/update
Update submodules
2020-08-25 16:36:10 +02:00
Finn Stutzenstein
3fe8b9b23c
Update submodules 2020-08-25 16:29:16 +02:00
Oskar Hahn
85bb8bbb5c
Update models.txt (#5523)
Update models.txt
2020-08-25 09:51:00 +02:00
Finn Stutzenstein
5846838a04
Merge pull request #5524 from FinnStutzenstein/update
Update models.txt
2020-08-24 15:57:13 +02:00
Finn Stutzenstein
0d2c91d8f9
Update models.txt 2020-08-24 15:56:14 +02:00
Finn Stutzenstein
829a44177a
Merge pull request #5518 from FinnStutzenstein/noteGenericRelations
Add reverse models for generic relations in models.txt (closes #5337)
2020-08-21 07:56:00 +02:00
Finn Stutzenstein
48a66d85bf
Add reverse models for generic relations in models.txt (closes #5337) 2020-08-21 07:55:01 +02:00
Finn Stutzenstein
fc3b498511
Mediaservice interface 2020-08-18 10:39:20 +02:00
Finn Stutzenstein
3fb41bf800
Merge pull request #5512 from FinnStutzenstein/update
Fix HaProxy redirection and client
2020-08-17 13:43:02 +02:00
Finn Stutzenstein
0993c25e66
Fix HaProxy redirection and client 2020-08-17 13:36:42 +02:00
Finn Stutzenstein
cb894c9d99
Merge pull request #5499 from FinnStutzenstein/moreCalculatedFields
Add calculated fields
2020-08-17 12:10:24 +02:00
Finn Stutzenstein
6ccf13bc6d
Merge pull request #5511 from FinnStutzenstein/update
Update Client and Auth service
2020-08-17 10:15:00 +02:00
Finn Stutzenstein
b312dc9297
Update Client and Auth service 2020-08-17 10:14:14 +02:00
Finn Stutzenstein
c86c3bdcbb
Merge pull request #5509 from tsiegleauq/slight-dev-docu-enhancement
Add https-info and enhance work-in-submodules doc
2020-08-14 11:16:00 +02:00
Finn Stutzenstein
ae2b73a8e5
Merge pull request #5510 from FinnStutzenstein/haproxy-redirect
Added redirect from http to https
2020-08-14 11:14:51 +02:00
Finn Stutzenstein
ff2569aba9
Added redirect from http to https 2020-08-14 11:13:56 +02:00