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

Re #8941. Started working on enqueueing requests and processing them in a new thread. + Program.cs cleanup + Fixed Date error.

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

Merge branch 'master' into predictor

re #8847 Fixing conflicts in merge

Merge branch 'UIPrototype' into 'master'

Ui prototype

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

Merge branch 'ServerChanges' into 'master'

Server changes

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

Merge branch 'master' into 'ServerChanges'

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