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

Re #8685 Android server connection test

Re #8685 Prototype base

re #8683 Fixing project dependencies problems

Delete .suo

re #8683 clean after merge

Merge branch 'dataDownload_connection' into 'master'

Data download connection

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

Merge branch 'master' into 'dataDownload_connection'

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

Merge branch 'NBC' into 'master'

Nbc

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

Merge branch 'ServerParsing' into 'master'

Server parsing

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

Merge branch 'master' into 'ServerParsing'

1. Conflicts:
2. Server/ServerApp.sln
3. Server/ServerApp/Parser/InputData/CsvDataLoader.cs
4. Server/ServerApp/Parser/InputData/JisInstance.cs
5. Server/ServerApp/Parser/InputData/LogInInstance.cs
6. Server/ServerApp/Parser/InputData/WeatherInstance.cs...