Projekt

Obecné

Profil

Statistiky
| Větev: | Tag: | Revize:

aswi2021tri-musketyri-gitlab @ 8f8d8aa7

# Datum Autor Komentář
8f8d8aa7 2021-06-13 10:41 Roman Kalivoda

Re #9034 Refactoring
5c201a38 2021-06-12 18:11 Roman Kalivoda

Merge branch 'PredictorAPI' into 'develop'

Predictor api

See merge request aswi/aswi-2021/aswi2021tri-musketyri!42
f36c9005 2021-06-12 18:09 Roman Kalivoda

Merge branch 'develop' into 'PredictorAPI'

  1. Conflicts:
  2. Server/ServerApp/Program.cs
  3. Server/ServerApp/Properties/launchSettings.json
1afe46cb 2021-06-12 17:54 Eliška Mourycová

Merge branch 'Edits_Testing_E' into 'develop'

Edits testing e

See merge request aswi/aswi-2021/aswi2021tri-musketyri!41
9cc42e60 2021-06-12 17:50 Eliška Mourycová

Re #9055. Fixed admin commands related bug + refactor + documentation comments
423d2870 2021-06-12 17:47 Alex Konig

Merge branch 'ParserEditsII' into 'develop'

Parser edits ii

See merge request aswi/aswi-2021/aswi2021tri-musketyri!40
de139774 2021-06-12 17:45 Alex Konig

re #9037 Adding a couple of JisParser tests
9a529f10 2021-06-12 16:27 Roman Kalivoda

Re #9063 Refactoring, fixing bugs
f9dd116f 2021-06-11 14:10 Alex Konig

re #9036 Editing logging
dbf79345 2021-06-11 11:48 Alex Konig

re #9036 Cleaning up interfaces
76072df0 2021-06-10 17:01 Roman Kalivoda

Re #8597 Implementation of AbstractClassificationPredictor, SdcaMEClassifier
8800fb76 2021-06-09 20:14 Eliška Mourycová

Refactor, cleanup + usage of logging class instead of 'Console.WriteLine's.
6dc585b4 2021-06-08 18:47 Roman Kalivoda

Re #9049 thread-safety implementation
bf95cbdd 2021-06-07 18:30 Eliška Mourycová

Added model commands handling - not tested.
a0e55b9c 2021-06-07 17:36 Alex Konig

Merge branch 'ParserEditsII' into 'develop'

Parser edits ii

See merge request aswi/aswi-2021/aswi2021tri-musketyri!39
e9ccd3ac 2021-06-07 17:36 Alex Konig

Merge branch 'develop' into 'ParserEditsII'

  1. Conflicts:
  2. Server/ServerApp/Program.cs
  3. Server/ServerApp/Properties/launchSettings.json
393029e8 2021-06-07 17:34 Eliška Mourycová

Merge branch 'Edits_Testing_E' into 'develop'

Edits testing e

See merge request aswi/aswi-2021/aswi2021tri-musketyri!38
c2cd2496 2021-06-07 17:33 Roman Kalivoda

Merge branch 'PredictorAPI' into 'develop'

Predictor api

See merge request aswi/aswi-2021/aswi2021tri-musketyri!37
3c4b53fe 2021-06-07 16:17 Roman Kalivoda

Re #9049 Implemented Rollback method
4d957345 2021-06-06 11:33 Eliška Mourycová

Re #9050. Added tests for admin commands parsing.
3729dcae 2021-06-06 10:03 Alex Konig

re #9037 Empty input testing
23e8ae04 2021-06-06 09:38 Alex Konig

re #9036 Edits to be able to survive wrong inputs
cf35739b 2021-06-06 08:34 Eliška Mourycová

Refs #9051, #9050. Added more tests + fixed some bugs revealed by the tests.
c592262d 2021-06-05 21:15 Eliška Mourycová

Re #9051. Added tests for data downloading and retrieval.
0e7b6b11 2021-06-05 19:37 Roman Kalivoda

Re #9049 Implementation of GetDataFileNames and Load methods
c9ac14ff 2021-06-05 18:59 Eliška Mourycová

Re #9051. Prepared for testing.
0060a0ae 2021-06-05 11:36 Roman Kalivoda

Re #9056 refactoring
1f1235a8 2021-06-05 11:34 Roman Kalivoda

Re #8593 updated default prediction config
27aa66b5 2021-06-04 19:40 Alex Konig

re #9037 Fixing json parser tests to work w/ IDataDownloader
38a18391 2021-06-04 18:42 Eliška Mourycová

Re #9007. Added weather prediction website to the config file + modified method for weather predictoin download.
dfc9e9f7 2021-06-04 16:52 Alex Konig

Updating develop branch
ce0940b5 2021-06-04 09:40 Roman Kalivoda

Re #9034 fixing files corrupted by merge
189c945b 2021-06-01 15:16 Roman Kalivoda

Merge branch 'develop'
f6680ba0 2021-06-01 14:22 Alex Konig

Merge branch 'UIPrototype' into 'master'

Re #8949 UI updates, bugfixes, com. finalized

See merge request aswi/aswi-2021/aswi2021tri-musketyri!34
af50416b 2021-05-31 11:59 Zuzana Káčereková

Re #8949 UI updates, bugfixes, com. finalized
1de7592f 2021-05-31 06:52 Eliška Mourycová

Merge branch 'DataDownloaderTesting_ConnectionFixes' into 'develop'

Data downloader testing connection fixes

See merge request aswi/aswi-2021/aswi2021tri-musketyri!31
46008820 2021-05-28 07:13 Eliška Mourycová

Merge branch 'DataDownloaderTesting_ConnectionFixes' of https://gitlab.kiv.zcu.cz/aswi/aswi-2021/aswi2021tri-musketyri into DataDownloaderTesting_ConnectionFixes
9547fd4a 2021-05-28 07:11 Eliška Mourycová

Refs #9008, #8919. Data directory path should now be ok on linux + added interface for DataDownloader + changed time span of default downloaded data.
03fa0b64 2021-05-27 17:17 Eliška Mourycová

Merge branch 'DataDownloaderTesting_ConnectionFixes' into 'develop'

Modified XML deserialization + commands acceptor

See merge request aswi/aswi-2021/aswi2021tri-musketyri!30
a4f9bb0a 2021-05-27 17:16 Eliška Mourycová

Merge branch 'develop' into 'DataDownloaderTesting_ConnectionFixes'

  1. Conflicts:
  2. Server/ServerApp/Properties/launchSettings.json
5cb4249a 2021-05-27 17:13 Eliška Mourycová

Modified XML deserialization + commands acceptor
121cc9d7 2021-05-27 16:30 Roman Kalivoda

Merge branch 'PredictorAPI' into 'develop'

Re #8953 tests

See merge request aswi/aswi-2021/aswi2021tri-musketyri!29
0d31f7e0 2021-05-27 16:28 Roman Kalivoda

Re #8953 tests
ce488379 2021-05-26 21:09 Roman Kalivoda

Merge branch 'bugfix-https' into 'develop'

Re #9009 Migrate existing tests

See merge request aswi/aswi-2021/aswi2021tri-musketyri!28
847434c6 2021-05-26 20:50 Roman Kalivoda

Re #9009 Migrate existing tests
7c90fc78 2021-05-26 18:37 Roman Kalivoda

Merge branch 'bugfix-https' into 'develop'

Re #9009 migrate test projects

See merge request aswi/aswi-2021/aswi2021tri-musketyri!27
b8b5af05 2021-05-26 18:35 Roman Kalivoda

Re #9009 migrate test projects
0ee01fba 2021-05-26 18:18 Eliška Mourycová

Merge branch 'bugfix-https' into 'develop'

Bugfix https

See merge request aswi/aswi-2021/aswi2021tri-musketyri!26
f94d14f8 2021-05-26 18:12 Eliška Mourycová

Merge branch 'bugfix-https' of https://gitlab.kiv.zcu.cz/aswi/aswi-2021/aswi2021tri-musketyri into bugfix-https
e60f81f3 2021-05-26 18:11 Eliška Mourycová

Re #8943. More debug info added to comminication handling.
2b7b0f12 2021-05-26 17:53 Roman Kalivoda

Re #9009 Migrate test project
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
4b847de5 2021-05-25 11:21 Alex Konig

re #8933 Testing LoginParser
a53b1de8 2021-05-24 18:49 Alex Konig

re #8933 Testing DataParser, JisParser and WeatherParser
b78c3571 2021-05-24 15:54 Eliška Mourycová

Re #8943. Unsuccesfully trying to run the app on linux; Microsoft.ML complaints.
870cd163 2021-05-24 13:16 Roman Kalivoda

Re #8953 Implement prediction
da9245bf 2021-05-24 10:40 Eliška Mourycová

Re #8941. Implemented asynchronous listening for clients' requests.
92897198 2021-05-23 14:17 Eliška Mourycová

Re #8944. Prepared testing class for DataDownloader.
40f56e57 2021-05-22 07:48 Eliška Mourycová

Re #8942. Implemented data and help commands.
cdeee9f8 2021-05-21 13:27 Roman Kalivoda

Re #8955 implemented multiple predictors support
60a60164 2021-05-21 13:25 Roman Kalivoda

Re #8955 refactoring
c4383c00 2021-05-21 12:29 Eliška Mourycová

Re #8942. Started implementing admin commands.
86c29fc1 2021-05-21 11:15 Eliška Mourycová

Re #8943. Prepared getting predictions from Model.
14bef778 2021-05-20 07:55 Eliška Mourycová

Fixed build errors
79227a05 2021-05-20 07:50 Eliška Mourycová

Re #8943. Untested integration with Model.
6d0d1410 2021-05-20 07:33 Eliška Mourycová

Re #8941. Started working on enqueueing requests and processing them in a new thread. + Program.cs cleanup + Fixed Date error.
77b0eeee 2021-05-19 16:53 Alex Konig

Merge branch 'ParserEdits' into 'develop'

ParserEdits vol.1

See merge request aswi/aswi-2021/aswi2021tri-musketyri!15
23e9ca21 2021-05-19 16:49 Alex Konig

re #8935 Program that can crop textures and outputs cropped versions + coordinates in original + coordinates of centroid in output image
fffe7190 2021-05-19 10:36 Alex Konig

re #8962 Adding filtering method GetPredictionForTime to json parser + adding attributes with file names to DataParser + fixing bug in json parser method Parse
38bc0a91 2021-05-17 13:33 Roman Kalivoda

Merge branch 'predictor' into 'master'

Predictor

See merge request aswi/aswi-2021/aswi2021tri-musketyri!14
d358b79e 2021-05-17 13:27 Roman Kalivoda

Re #8832 Label creation
d103c273 2021-05-17 10:21 Roman Kalivoda

Merge branch 'master' into predictor
569d5612 2021-05-17 09:43 Alex Konig

re #8847 Fixing conflicts in merge
2d3a738b 2021-05-17 09:17 Alex Konig

Merge branch 'UIPrototype' into 'master'

Ui prototype

See merge request aswi/aswi-2021/aswi2021tri-musketyri!13
1087d08f 2021-05-17 09:13 Alex Konig

Merge branch 'ServerChanges' into 'master'

Server changes

See merge request aswi/aswi-2021/aswi2021tri-musketyri!12
34ff7508 2021-05-17 09:12 Alex Konig

Merge branch 'master' into 'ServerChanges'

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