-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/feedback-api
# Conflicts: # client/localServer/client.go # docker-compose.yaml # server/api/tumdev/campus_backend.pb.go # server/backend/rpcserver.go # server/swagger/swagger.json
- Loading branch information
Showing
66 changed files
with
2,218 additions
and
3,863 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,12 +16,15 @@ services: | |
| - APNS_KEY_ID=${APNS_KEY_ID} | ||
| - APNS_TEAM_ID=${APNS_TEAM_ID} | ||
| - APNS_P8_FILE_PATH=${APNS_P8_FILE_PATH} | ||
| - MensaCronDisabled=false | ||
| - SMTP_PASSWORD=${SMTP_PASSWORD} | ||
| - SMTP_URL=${SMTP_URL:-postout.lrz.de} | ||
| - SMTP_USERNAME=${SMTP_USERNAME:[email protected]} | ||
| - SMTP_PORT=${SMTP_PORT:-587} | ||
| volumes: | ||
| - backend-storage:/Storage | ||
| - ./apns_auth_key.p8:${APNS_P8_FILE_PATH} | ||
| user: 1000:3000 | ||
| depends_on: | ||
| db: | ||
| condition: service_healthy | ||
|
|
@@ -45,4 +48,6 @@ services: | |
|
|
||
| volumes: | ||
| campus-db-data: | ||
| driver: local | ||
| backend-storage: | ||
| driver: local | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,2 @@ | ||
| # Generated by buf. DO NOT EDIT. | ||
| version: v1 | ||
| deps: | ||
| - remote: buf.build | ||
| owner: googleapis | ||
| repository: googleapis | ||
| commit: 28151c0d0a1641bf938a7672c500e01d | ||
| digest: shake256:49215edf8ef57f7863004539deff8834cfb2195113f0b890dd1f67815d9353e28e668019165b9d872395871eeafcbab3ccfdb2b5f11734d3cca95be9e8d139de |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| version: v1 | ||
| deps: | ||
| - buf.build/googleapis/googleapis | ||
| deps: [] | ||
| lint: | ||
| use: | ||
| - DEFAULT | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // Copyright 2015 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| syntax = "proto3"; | ||
|
|
||
| package google.api; | ||
|
|
||
| import "google/api/http.proto"; | ||
| import "google/protobuf/descriptor.proto"; | ||
|
|
||
| option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; | ||
| option java_multiple_files = true; | ||
| option java_outer_classname = "AnnotationsProto"; | ||
| option java_package = "com.google.api"; | ||
| option objc_class_prefix = "GAPI"; | ||
|
|
||
| extend google.protobuf.MethodOptions { | ||
| // See `HttpRule`. | ||
| HttpRule http = 72295728; | ||
| } |
Oops, something went wrong.