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

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

Merge branch 'TestingParser' into 'master'

Testing parser

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

Re #8829 Added heatmap visualization

Re #8838. Started refining commands accepting + modified GetData in DataDownloader.

Merge branch 'predictor' into 'TestingParser'

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

Re #8831 Changed deserialization

Re #8836. Added XML protocol building / parsing.