Projekt

Obecné

Profil

Revize:

Revizí

# Datum Autor Komentář
a6ad06e5 2021-05-26 17:41 Alex Konig

Merge branch 'ParserTestingIII' into 'develop'

Parser testing iii

See merge request aswi/aswi-2021/aswi2021tri-musketyri!25
f97dc90a 2021-05-26 17:40 Alex Konig

Merge branch 'develop' into 'ParserTestingIII'

  1. Conflicts:
  2. Server/ServerApp/Program.cs
  3. Server/TestProject/TestProject.csproj
7f1b7d1e 2021-05-26 17:38 Alex Konig

Merge branch 'TextureEditing' into 'develop'

re #8935 Program that can crop textures and outputs cropped versions +...

See merge request aswi/aswi-2021/aswi2021tri-musketyri!24
bf906ac5 2021-05-26 17:36 Alex Konig

Push before merge
29a3f064 2021-05-26 15:20 Roman Kalivoda

Re #9009 fix https listener issue
12b8fd03 2021-05-26 09:29 Roman Kalivoda

Re #9009 Merge branch 'dotnetMigration' into 'develop'

Dotnet migration

See merge request aswi/aswi-2021/aswi2021tri-musketyri!23
8a243ab2 2021-05-26 08:47 Alex Konig

re #8962 Fixing bugs in JsonParser.EncompassSunriseSetTimes
8fe013d2 2021-05-26 08:23 Roman Kalivoda

Re #9009 rebase to current changes
5e6dbc33 2021-05-26 08:20 Roman Kalivoda

Re #9009 Migrate to .NET 5.0
79aa3a39 2021-05-26 07:56 Roman Kalivoda

Re #8953 Adapt to changes from lower layer
bc77899c 2021-05-26 07:35 Roman Kalivoda

Merge branch 'PredictorAPI' into 'develop'

Predictor api to develop

See merge request aswi/aswi-2021/aswi2021tri-musketyri!22
22c83f99 2021-05-26 07:34 Roman Kalivoda

Merge branch 'develop' into 'PredictorAPI'

  1. Conflicts:
  2. Server/ServerApp/Program.cs
d676dc20 2021-05-26 07:31 Roman Kalivoda

Merge branch 'revert-90ccd340' into 'master'

Revert "Merge branch 'PredictorAPI' into 'master'"

See merge request aswi/aswi-2021/aswi2021tri-musketyri!21
22211075 2021-05-26 07:30 Roman Kalivoda

Revert "Merge branch 'PredictorAPI' into 'master'"

This reverts merge request !20
90ccd340 2021-05-26 07:30 Roman Kalivoda

Merge branch 'PredictorAPI' into 'master'

Predictor api to develop

See merge request aswi/aswi-2021/aswi2021tri-musketyri!20
26ecc756 2021-05-25 19:45 Alex Konig

re #8962 Adding reading of file to string to CsvDataLoader
bfd5a848 2021-05-25 18:57 Alex Konig

re #8934 Creating unit tests for json parser
b8ac4d66 2021-05-25 17:40 Roman Kalivoda

Re #9009 Migrate to .NET 5.0
34d58211 2021-05-25 16:51 Eliška Mourycová

Merge branch 'MultiClientConnection_ModelIntegration' into 'develop'

Multi client connection model integration

See merge request aswi/aswi-2021/aswi2021tri-musketyri!19
cde64114 2021-05-25 16:50 Eliška Mourycová

Merge branch 'develop' into 'MultiClientConnection_ModelIntegration'

  1. Conflicts:
  2. Server/TestProject/TestProject.csproj
d5347377 2021-05-25 16:36 Eliška Mourycová

Re #8941. Responses to GET requests.
74bb2a59 2021-05-25 16:11 Roman Kalivoda

Re #8953 refactoring
65e00d54 2021-05-25 13:42 Alex Konig

Merge branch 'ParserTestingII' into 'develop'

Parser testing ii

See merge request aswi/aswi-2021/aswi2021tri-musketyri!17
0c0f6a10 2021-05-25 13:40 Alex Konig

Merge branch 'develop' into 'ParserTestingII'

  1. Conflicts:
  2. Server/ServerApp/WeatherPredictionParser/IJsonParser.cs
  3. Server/ServerApp/WeatherPredictionParser/JsonParser.cs
346be8db 2021-05-25 13:38 Alex Konig

re #8934 Testing JsonParser

(76-100/193) 25, 50, 100 na stránku

Také k dispozici: Atom