ASWI - Pokročilé softwarové inženýrství » ASWI 2021 » OpenData vlastní téma (KIV) - Tři Mušketýři

Re #8953 Adapt to changes from lower layer

Merge branch 'PredictorAPI' into 'develop'

Predictor api to develop

See merge request aswi/aswi-2021/aswi2021tri-musketyri!22

Merge branch 'develop' into 'PredictorAPI'

1. Conflicts:
2. Server/ServerApp/Program.cs

Merge branch 'MultiClientConnection_ModelIntegration' into 'develop'

Multi client connection model integration

See merge request aswi/aswi-2021/aswi2021tri-musketyri!19

Merge branch 'develop' into 'MultiClientConnection_ModelIntegration'

1. Conflicts:
2. Server/TestProject/TestProject.csproj

Re #8941. Responses to GET requests.

Re #8953 refactoring

Merge branch 'ParserTestingII' into 'develop'

Parser testing ii

See merge request aswi/aswi-2021/aswi2021tri-musketyri!17

Merge branch 'develop' into 'ParserTestingII'

1. Conflicts:
2. Server/ServerApp/WeatherPredictionParser/IJsonParser.cs
3. Server/ServerApp/WeatherPredictionParser/JsonParser.cs

re #8934 Testing JsonParser