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

Re #9009 Migrate to .NET 5.0

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

re #8933 Testing LoginParser

re #8933 Testing DataParser, JisParser and WeatherParser

Merge branch 'ParserEdits' into 'develop'

ParserEdits vol.1

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

re #8962 Adding filtering method GetPredictionForTime to json parser + adding attributes with file names to DataParser + fixing bug in json parser method Parse

Merge branch 'predictor' into 'master'

Predictor

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

Re #8832 Label creation