Projekt

Obecné

Profil

Aktivita

Od 2021-04-29 do 2021-05-28

2021-05-28

07:13 Revize 46008820 (aswi2021tri-musketyri-gitlab): Merge branch 'DataDownloaderTesting_ConnectionFixes' of https://gitlab.kiv.zcu.cz/aswi/aswi-2021/aswi2021tri-musketyri into DataDownloaderTesting_ConnectionFixes
Eliška Mourycová
07:11 Revize 9547fd4a (aswi2021tri-musketyri-gitlab): Refs #9008, #8919. Data directory path should now be ok on linux + added interface for DataDownloader + changed time span of default downloaded data.
Eliška Mourycová

2021-05-27

17:17 Revize 03fa0b64 (aswi2021tri-musketyri-gitlab): Merge branch 'DataDownloaderTesting_ConnectionFixes' into 'develop'
Modified XML deserialization + commands acceptor
See merge request aswi/aswi-2021/aswi2021tri-musketyri!30 Eliška Mourycová
17:16 Revize a4f9bb0a (aswi2021tri-musketyri-gitlab): Merge branch 'develop' into 'DataDownloaderTesting_ConnectionFixes'
# Conflicts:
# Server/ServerApp/Properties/launchSettings.json Eliška Mourycová
17:13 Revize 5cb4249a (aswi2021tri-musketyri-gitlab): Modified XML deserialization + commands acceptor
Eliška Mourycová
16:30 Revize 121cc9d7 (aswi2021tri-musketyri-gitlab): Merge branch 'PredictorAPI' into 'develop'
Re #8953 tests
See merge request aswi/aswi-2021/aswi2021tri-musketyri!29 Roman Kalivoda
16:28 Revize 0d31f7e0 (aswi2021tri-musketyri-gitlab): Re #8953 tests
Roman Kalivoda

2021-05-26

21:09 Revize ce488379 (aswi2021tri-musketyri-gitlab): Merge branch 'bugfix-https' into 'develop'
Re #9009 Migrate existing tests
See merge request aswi/aswi-2021/aswi2021tri-musketyri!28 Roman Kalivoda
20:50 Revize 847434c6 (aswi2021tri-musketyri-gitlab): Re #9009 Migrate existing tests
Roman Kalivoda
18:37 Revize 7c90fc78 (aswi2021tri-musketyri-gitlab): Merge branch 'bugfix-https' into 'develop'
Re #9009 migrate test projects
See merge request aswi/aswi-2021/aswi2021tri-musketyri!27 Roman Kalivoda
18:35 Revize b8b5af05 (aswi2021tri-musketyri-gitlab): Re #9009 migrate test projects
Roman Kalivoda
18:18 Revize 0ee01fba (aswi2021tri-musketyri-gitlab): Merge branch 'bugfix-https' into 'develop'
Bugfix https
See merge request aswi/aswi-2021/aswi2021tri-musketyri!26 Eliška Mourycová
18:12 Revize f94d14f8 (aswi2021tri-musketyri-gitlab): Merge branch 'bugfix-https' of https://gitlab.kiv.zcu.cz/aswi/aswi-2021/aswi2021tri-musketyri into bugfix-https
Eliška Mourycová
18:11 Revize e60f81f3 (aswi2021tri-musketyri-gitlab): Re #8943. More debug info added to comminication handling.
Eliška Mourycová
17:53 Revize 2b7b0f12 (aswi2021tri-musketyri-gitlab): Re #9009 Migrate test project
Roman Kalivoda
17:41 Revize a6ad06e5 (aswi2021tri-musketyri-gitlab): Merge branch 'ParserTestingIII' into 'develop'
Parser testing iii
See merge request aswi/aswi-2021/aswi2021tri-musketyri!25 Alex Konig
17:40 Revize f97dc90a (aswi2021tri-musketyri-gitlab): Merge branch 'develop' into 'ParserTestingIII'
# Conflicts:
# Server/ServerApp/Program.cs
# Server/TestProject/TestProject.csproj Alex Konig
17:38 Revize 7f1b7d1e (aswi2021tri-musketyri-gitlab): Merge branch 'TextureEditing' into 'develop'
re #8935 Program that can crop textures and outputs cropped versions +...
See merge request aswi/aswi-2021/aswi2021t... Alex Konig
17:36 Revize bf906ac5 (aswi2021tri-musketyri-gitlab): Push before merge
Alex Konig
15:20 Revize 29a3f064 (aswi2021tri-musketyri-gitlab): Re #9009 fix https listener issue
Roman Kalivoda
09:29 Revize 12b8fd03 (aswi2021tri-musketyri-gitlab): Re #9009 Merge branch 'dotnetMigration' into 'develop'
Dotnet migration
See merge request aswi/aswi-2021/aswi2021tri-musketyri!23 Roman Kalivoda
08:47 Revize 8a243ab2 (aswi2021tri-musketyri-gitlab): re #8962 Fixing bugs in JsonParser.EncompassSunriseSetTimes
Alex Konig
08:23 Revize 8fe013d2 (aswi2021tri-musketyri-gitlab): Re #9009 rebase to current changes
Roman Kalivoda
08:20 Revize 5e6dbc33 (aswi2021tri-musketyri-gitlab): Re #9009 Migrate to .NET 5.0
Roman Kalivoda
07:56 Revize 79aa3a39 (aswi2021tri-musketyri-gitlab): Re #8953 Adapt to changes from lower layer
Roman Kalivoda
07:35 Revize bc77899c (aswi2021tri-musketyri-gitlab): Merge branch 'PredictorAPI' into 'develop'
Predictor api to develop
See merge request aswi/aswi-2021/aswi2021tri-musketyri!22 Roman Kalivoda
07:34 Revize 22c83f99 (aswi2021tri-musketyri-gitlab): Merge branch 'develop' into 'PredictorAPI'
# Conflicts:
# Server/ServerApp/Program.cs Roman Kalivoda
07:31 Revize d676dc20 (aswi2021tri-musketyri-gitlab): Merge branch 'revert-90ccd340' into 'master'
Revert "Merge branch 'PredictorAPI' into 'master'"
See merge request aswi/aswi-2021/aswi2021tri-musketyri!21 Roman Kalivoda
07:30 Revize 22211075 (aswi2021tri-musketyri-gitlab): Revert "Merge branch 'PredictorAPI' into 'master'"
This reverts merge request !20 Roman Kalivoda
07:30 Revize 90ccd340 (aswi2021tri-musketyri-gitlab): Merge branch 'PredictorAPI' into 'master'
Predictor api to develop
See merge request aswi/aswi-2021/aswi2021tri-musketyri!20 Roman Kalivoda

2021-05-25

19:45 Revize 26ecc756 (aswi2021tri-musketyri-gitlab): re #8962 Adding reading of file to string to CsvDataLoader
Alex Konig
18:57 Revize bfd5a848 (aswi2021tri-musketyri-gitlab): re #8934 Creating unit tests for json parser
Alex Konig
17:40 Revize b8ac4d66 (aswi2021tri-musketyri-gitlab): Re #9009 Migrate to .NET 5.0
Roman Kalivoda
16:51 Revize 34d58211 (aswi2021tri-musketyri-gitlab): Merge branch 'MultiClientConnection_ModelIntegration' into 'develop'
Multi client connection model integration
See merge request aswi/aswi-2021/aswi2021tri-musketyri!19 Eliška Mourycová
16:50 Revize cde64114 (aswi2021tri-musketyri-gitlab): Merge branch 'develop' into 'MultiClientConnection_ModelIntegration'
# Conflicts:
# Server/TestProject/TestProject.csproj Eliška Mourycová
16:36 Revize d5347377 (aswi2021tri-musketyri-gitlab): Re #8941. Responses to GET requests.
Eliška Mourycová
16:11 Revize 74bb2a59 (aswi2021tri-musketyri-gitlab): Re #8953 refactoring
Roman Kalivoda
13:42 Revize 65e00d54 (aswi2021tri-musketyri-gitlab): Merge branch 'ParserTestingII' into 'develop'
Parser testing ii
See merge request aswi/aswi-2021/aswi2021tri-musketyri!17 Alex Konig
13:40 Revize 0c0f6a10 (aswi2021tri-musketyri-gitlab): Merge branch 'develop' into 'ParserTestingII'
# Conflicts:
# Server/ServerApp/WeatherPredictionParser/IJsonParser.cs
# Server/ServerApp/WeatherPredictionParser... Alex Konig
13:38 Revize 346be8db (aswi2021tri-musketyri-gitlab): re #8934 Testing JsonParser
Alex Konig
11:21 Revize 4b847de5 (aswi2021tri-musketyri-gitlab): re #8933 Testing LoginParser
Alex Konig

2021-05-24

18:49 Revize a53b1de8 (aswi2021tri-musketyri-gitlab): re #8933 Testing DataParser, JisParser and WeatherParser
Alex Konig
15:54 Revize b78c3571 (aswi2021tri-musketyri-gitlab): Re #8943. Unsuccesfully trying to run the app on linux; Microsoft.ML complaints.
Eliška Mourycová
13:16 Revize 870cd163 (aswi2021tri-musketyri-gitlab): Re #8953 Implement prediction
Roman Kalivoda
10:40 Revize da9245bf (aswi2021tri-musketyri-gitlab): Re #8941. Implemented asynchronous listening for clients' requests.
Eliška Mourycová

2021-05-23

14:17 Revize 92897198 (aswi2021tri-musketyri-gitlab): Re #8944. Prepared testing class for DataDownloader.
Eliška Mourycová

2021-05-22

07:48 Revize 40f56e57 (aswi2021tri-musketyri-gitlab): Re #8942. Implemented data and help commands.
Eliška Mourycová

2021-05-21

13:27 Revize cdeee9f8 (aswi2021tri-musketyri-gitlab): Re #8955 implemented multiple predictors support
Roman Kalivoda
13:25 Revize 60a60164 (aswi2021tri-musketyri-gitlab): Re #8955 refactoring
Roman Kalivoda
12:29 Revize c4383c00 (aswi2021tri-musketyri-gitlab): Re #8942. Started implementing admin commands.
Eliška Mourycová
11:15 Revize 86c29fc1 (aswi2021tri-musketyri-gitlab): Re #8943. Prepared getting predictions from Model.
Eliška Mourycová

2021-05-20

07:55 Revize 14bef778 (aswi2021tri-musketyri-gitlab): Fixed build errors
Eliška Mourycová
07:50 Revize 79227a05 (aswi2021tri-musketyri-gitlab): Re #8943. Untested integration with Model.
Eliška Mourycová
07:33 Revize 6d0d1410 (aswi2021tri-musketyri-gitlab): Re #8941. Started working on enqueueing requests and processing them in a new thread. + Program.cs cleanup + Fixed Date error.
Eliška Mourycová

2021-05-19

16:53 Revize 77b0eeee (aswi2021tri-musketyri-gitlab): Merge branch 'ParserEdits' into 'develop'
ParserEdits vol.1
See merge request aswi/aswi-2021/aswi2021tri-musketyri!15 Alex Konig
16:49 Revize 23e9ca21 (aswi2021tri-musketyri-gitlab): re #8935 Program that can crop textures and outputs cropped versions + coordinates in original + coordinates of centroid in output image
Alex Konig
10:36 Revize fffe7190 (aswi2021tri-musketyri-gitlab): re #8962 Adding filtering method GetPredictionForTime to json parser + adding attributes with file names to DataParser + fixing bug in json parser method Parse
Alex Konig

2021-05-17

13:33 Revize 38bc0a91 (aswi2021tri-musketyri-gitlab): Merge branch 'predictor' into 'master'
Predictor
See merge request aswi/aswi-2021/aswi2021tri-musketyri!14 Roman Kalivoda
13:27 Revize d358b79e (aswi2021tri-musketyri-gitlab): Re #8832 Label creation
Roman Kalivoda
10:21 Revize d103c273 (aswi2021tri-musketyri-gitlab): Merge branch 'master' into predictor
Roman Kalivoda
09:43 Revize 569d5612 (aswi2021tri-musketyri-gitlab): re #8847 Fixing conflicts in merge
Alex Konig
09:17 Revize 2d3a738b (aswi2021tri-musketyri-gitlab): Merge branch 'UIPrototype' into 'master'
Ui prototype
See merge request aswi/aswi-2021/aswi2021tri-musketyri!13 Alex Konig
09:13 Revize 1087d08f (aswi2021tri-musketyri-gitlab): Merge branch 'ServerChanges' into 'master'
Server changes
See merge request aswi/aswi-2021/aswi2021tri-musketyri!12 Alex Konig
09:12 Revize 34ff7508 (aswi2021tri-musketyri-gitlab): Merge branch 'master' into 'ServerChanges'
# Conflicts:
# Server/ServerApp/Program.cs Alex Konig
09:10 Revize 7c7d7ad3 (aswi2021tri-musketyri-gitlab): Merge branch 'TestingParser' into 'master'
Testing parser
See merge request aswi/aswi-2021/aswi2021tri-musketyri!11 Alex Konig
09:05 Revize 2a7f543a (aswi2021tri-musketyri-gitlab): Re #8829 Added heatmap visualization
Zuzana Káčereková

2021-05-16

21:24 Revize 662b2404 (aswi2021tri-musketyri-gitlab): Re #8832 integration
Roman Kalivoda
17:33 Revize 4129ce12 (aswi2021tri-musketyri-gitlab): Re #8838. Started refining commands accepting + modified GetData in DataDownloader.
Eliška Mourycová
17:09 Revize 784f9ad6 (aswi2021tri-musketyri-gitlab): Merge branch 'TestingParser' into 'predictor'
Merge TestingParser into predictor
See merge request aswi/aswi-2021/aswi2021tri-musketyri!10 Roman Kalivoda
17:08 Revize f4d8507f (aswi2021tri-musketyri-gitlab): Merge branch 'predictor' into 'TestingParser'
# Conflicts:
# Server/ServerApp/Program.cs Roman Kalivoda
13:56 Revize e75e6857 (aswi2021tri-musketyri-gitlab): Re #8831 Changed deserialization
Zuzana Káčereková
11:58 Revize 6b4c34a2 (aswi2021tri-musketyri-gitlab): Re #8836. Added XML protocol building / parsing.
Eliška Mourycová
10:20 Revize 4cb8ae48 (aswi2021tri-musketyri-gitlab): re #8842 Fixing MergeAttendance
Alex Konig
09:43 Revize 99e5517e (aswi2021tri-musketyri-gitlab): re #8842 Start testing
Alex Konig

2021-05-15

20:40 Revize ebe96ca4 (aswi2021tri-musketyri-gitlab): Re #8832 PredictionController implementation
Roman Kalivoda
13:03 Revize 3cb70579 (aswi2021tri-musketyri-gitlab): Added communication model and XML serialization
Zuzana Káčereková

2021-05-14

21:51 Revize 755c25f3 (aswi2021tri-musketyri-gitlab): Upload first consistent client demo
Zuzana Káčereková
19:36 Revize 3e283a5f (aswi2021tri-musketyri-gitlab): Merge branch 'NBC' into 'master'
Re #8832 Refactoring
See merge request aswi/aswi-2021/aswi2021tri-musketyri!9 Roman Kalivoda
14:13 Revize 1216a2e3 (aswi2021tri-musketyri-gitlab): Merge branch 'JsonParser' into 'master'
Json parser
See merge request aswi/aswi-2021/aswi2021tri-musketyri!8 Alex Konig
14:11 Revize 9fb55c71 (aswi2021tri-musketyri-gitlab): re #8840 Update commit - start/endTime in method Parse in DataParser can now be null
Alex Konig

2021-05-12

07:54 Revize cd23df7f (aswi2021tri-musketyri-gitlab): Re #8836. Fixed errors appearing when client sends POST request by sending an answer to the request.
Eliška Mourycová

2021-05-11

12:23 Revize 4977ce53 (aswi2021tri-musketyri-gitlab): Re #8832 Refactoring
Refactored existing classes to comply with the coding conventions Roman Kalivoda

2021-05-10

18:08 Revize cdf3c217 (aswi2021tri-musketyri-gitlab): re #8841 Fixing errors in start/end time and adding interfaces for DataParser and JsonParser
Alex Konig
09:05 Revize c0dffb79 (aswi2021tri-musketyri-gitlab): re #8840 Fixing day changes in list of predictions
Alex Konig
08:51 Revize 1407c8ba (aswi2021tri-musketyri-gitlab): re #8840 Finishing up Json parser
Alex Konig

2021-05-07

15:37 Revize c9eed50c (aswi2021tri-musketyri-gitlab): re #8840 First test
Alex Konig

2021-05-02

09:37 Revize 43334784 (aswi2021tri-musketyri-gitlab): Merge branch 'UIPrototype' into 'master'
Ui prototype
See merge request aswi/aswi-2021/aswi2021tri-musketyri!7 Alex Konig
08:00 Revize 3dc0ae76 (aswi2021tri-musketyri-gitlab): re 8683 Fix merge errors
Alex Konig
07:55 Revize bda033c3 (aswi2021tri-musketyri-gitlab): Merge branch 'DataHandlerChanges' into 'master'
Data handler changes
See merge request aswi/aswi-2021/aswi2021tri-musketyri!6 Alex Konig
07:55 Revize bcd81e04 (aswi2021tri-musketyri-gitlab): Merge branch 'master' into 'DataHandlerChanges'
# Conflicts:
# Server/ServerApp/Program.cs Alex Konig
07:38 Revize 0edb4a56 (aswi2021tri-musketyri-gitlab): Merge branch 'ServerParsingFix' into 'master'
Server parsing fix
See merge request aswi/aswi-2021/aswi2021tri-musketyri!5 Alex Konig
06:38 Revize 3aba3c34 (aswi2021tri-musketyri-gitlab): Re #8770. Refactoring
Eliška Mourycová

2021-04-30

20:57 Revize e257ae8f (aswi2021tri-musketyri-gitlab): Re #8770. Somewhat working example of HttpListener. Can receive requests from other than host machine. Firawall adjustment was necessary.
Eliška Mourycová
 

Také k dispozici: Atom