Aktivita
Od 2021-05-06 do 2021-06-04
2021-06-04
- 19:40 Revize 27aa66b5 (aswi2021tri-musketyri-gitlab): re #9037 Fixing json parser tests to work w/ IDataDownloader
- 18:42 Revize 38a18391 (aswi2021tri-musketyri-gitlab): Re #9007. Added weather prediction website to the config file + modified method for weather predictoin download.
- 16:52 Revize dfc9e9f7 (aswi2021tri-musketyri-gitlab): Updating develop branch
- 09:40 Revize ce0940b5 (aswi2021tri-musketyri-gitlab): Re #9034 fixing files corrupted by merge
2021-06-01
- 15:16 Revize 189c945b (aswi2021tri-musketyri-gitlab): Merge branch 'develop'
- 14:22 Revize f6680ba0 (aswi2021tri-musketyri-gitlab): Merge branch 'UIPrototype' into 'master'
- Re #8949 UI updates, bugfixes, com. finalized
See merge request aswi/aswi-2021/aswi2021tri-musketyri!34
2021-05-31
- 11:59 Revize af50416b (aswi2021tri-musketyri-gitlab): Re #8949 UI updates, bugfixes, com. finalized
- 06:52 Revize 1de7592f (aswi2021tri-musketyri-gitlab): Merge branch 'DataDownloaderTesting_ConnectionFixes' into 'develop'
- Data downloader testing connection fixes
See merge request aswi/aswi-2021/aswi2021tri-musketyri!31
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
- 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.
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 - 17:16 Revize a4f9bb0a (aswi2021tri-musketyri-gitlab): Merge branch 'develop' into 'DataDownloaderTesting_ConnectionFixes'
- # Conflicts:
# Server/ServerApp/Properties/launchSettings.json - 17:13 Revize 5cb4249a (aswi2021tri-musketyri-gitlab): Modified XML deserialization + commands acceptor
- 16:30 Revize 121cc9d7 (aswi2021tri-musketyri-gitlab): Merge branch 'PredictorAPI' into 'develop'
- Re #8953 tests
See merge request aswi/aswi-2021/aswi2021tri-musketyri!29 - 16:28 Revize 0d31f7e0 (aswi2021tri-musketyri-gitlab): Re #8953 tests
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 - 20:50 Revize 847434c6 (aswi2021tri-musketyri-gitlab): Re #9009 Migrate existing tests
- 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 - 18:35 Revize b8b5af05 (aswi2021tri-musketyri-gitlab): Re #9009 migrate test projects
- 18:18 Revize 0ee01fba (aswi2021tri-musketyri-gitlab): Merge branch 'bugfix-https' into 'develop'
- Bugfix https
See merge request aswi/aswi-2021/aswi2021tri-musketyri!26 - 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
- 18:11 Revize e60f81f3 (aswi2021tri-musketyri-gitlab): Re #8943. More debug info added to comminication handling.
- 17:53 Revize 2b7b0f12 (aswi2021tri-musketyri-gitlab): Re #9009 Migrate test project
- 17:41 Revize a6ad06e5 (aswi2021tri-musketyri-gitlab): Merge branch 'ParserTestingIII' into 'develop'
- Parser testing iii
See merge request aswi/aswi-2021/aswi2021tri-musketyri!25 - 17:40 Revize f97dc90a (aswi2021tri-musketyri-gitlab): Merge branch 'develop' into 'ParserTestingIII'
- # Conflicts:
# Server/ServerApp/Program.cs
# Server/TestProject/TestProject.csproj - 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... - 17:36 Revize bf906ac5 (aswi2021tri-musketyri-gitlab): Push before merge
- 15:20 Revize 29a3f064 (aswi2021tri-musketyri-gitlab): Re #9009 fix https listener issue
- 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 - 08:47 Revize 8a243ab2 (aswi2021tri-musketyri-gitlab): re #8962 Fixing bugs in JsonParser.EncompassSunriseSetTimes
- 08:23 Revize 8fe013d2 (aswi2021tri-musketyri-gitlab): Re #9009 rebase to current changes
- 08:20 Revize 5e6dbc33 (aswi2021tri-musketyri-gitlab): Re #9009 Migrate to .NET 5.0
- 07:56 Revize 79aa3a39 (aswi2021tri-musketyri-gitlab): Re #8953 Adapt to changes from lower layer
- 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 - 07:34 Revize 22c83f99 (aswi2021tri-musketyri-gitlab): Merge branch 'develop' into 'PredictorAPI'
- # Conflicts:
# Server/ServerApp/Program.cs - 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 - 07:30 Revize 22211075 (aswi2021tri-musketyri-gitlab): Revert "Merge branch 'PredictorAPI' into 'master'"
- This reverts merge request !20
- 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
2021-05-25
- 19:45 Revize 26ecc756 (aswi2021tri-musketyri-gitlab): re #8962 Adding reading of file to string to CsvDataLoader
- 18:57 Revize bfd5a848 (aswi2021tri-musketyri-gitlab): re #8934 Creating unit tests for json parser
- 17:40 Revize b8ac4d66 (aswi2021tri-musketyri-gitlab): Re #9009 Migrate to .NET 5.0
- 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 - 16:50 Revize cde64114 (aswi2021tri-musketyri-gitlab): Merge branch 'develop' into 'MultiClientConnection_ModelIntegration'
- # Conflicts:
# Server/TestProject/TestProject.csproj - 16:36 Revize d5347377 (aswi2021tri-musketyri-gitlab): Re #8941. Responses to GET requests.
- 16:11 Revize 74bb2a59 (aswi2021tri-musketyri-gitlab): Re #8953 refactoring
- 13:42 Revize 65e00d54 (aswi2021tri-musketyri-gitlab): Merge branch 'ParserTestingII' into 'develop'
- Parser testing ii
See merge request aswi/aswi-2021/aswi2021tri-musketyri!17 - 13:40 Revize 0c0f6a10 (aswi2021tri-musketyri-gitlab): Merge branch 'develop' into 'ParserTestingII'
- # Conflicts:
# Server/ServerApp/WeatherPredictionParser/IJsonParser.cs
# Server/ServerApp/WeatherPredictionParser... - 13:38 Revize 346be8db (aswi2021tri-musketyri-gitlab): re #8934 Testing JsonParser
- 11:21 Revize 4b847de5 (aswi2021tri-musketyri-gitlab): re #8933 Testing LoginParser
2021-05-24
- 18:49 Revize a53b1de8 (aswi2021tri-musketyri-gitlab): re #8933 Testing DataParser, JisParser and WeatherParser
- 15:54 Revize b78c3571 (aswi2021tri-musketyri-gitlab): Re #8943. Unsuccesfully trying to run the app on linux; Microsoft.ML complaints.
- 13:16 Revize 870cd163 (aswi2021tri-musketyri-gitlab): Re #8953 Implement prediction
- 10:40 Revize da9245bf (aswi2021tri-musketyri-gitlab): Re #8941. Implemented asynchronous listening for clients' requests.
2021-05-23
- 14:17 Revize 92897198 (aswi2021tri-musketyri-gitlab): Re #8944. Prepared testing class for DataDownloader.
2021-05-22
2021-05-21
- 13:27 Revize cdeee9f8 (aswi2021tri-musketyri-gitlab): Re #8955 implemented multiple predictors support
- 13:25 Revize 60a60164 (aswi2021tri-musketyri-gitlab): Re #8955 refactoring
- 12:29 Revize c4383c00 (aswi2021tri-musketyri-gitlab): Re #8942. Started implementing admin commands.
- 11:15 Revize 86c29fc1 (aswi2021tri-musketyri-gitlab): Re #8943. Prepared getting predictions from Model.
2021-05-20
- 07:55 Revize 14bef778 (aswi2021tri-musketyri-gitlab): Fixed build errors
- 07:50 Revize 79227a05 (aswi2021tri-musketyri-gitlab): Re #8943. Untested integration with Model.
- 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.
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 - 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
- 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
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 - 13:27 Revize d358b79e (aswi2021tri-musketyri-gitlab): Re #8832 Label creation
- 10:21 Revize d103c273 (aswi2021tri-musketyri-gitlab): Merge branch 'master' into predictor
- 09:43 Revize 569d5612 (aswi2021tri-musketyri-gitlab): re #8847 Fixing conflicts in merge
- 09:17 Revize 2d3a738b (aswi2021tri-musketyri-gitlab): Merge branch 'UIPrototype' into 'master'
- Ui prototype
See merge request aswi/aswi-2021/aswi2021tri-musketyri!13 - 09:13 Revize 1087d08f (aswi2021tri-musketyri-gitlab): Merge branch 'ServerChanges' into 'master'
- Server changes
See merge request aswi/aswi-2021/aswi2021tri-musketyri!12 - 09:12 Revize 34ff7508 (aswi2021tri-musketyri-gitlab): Merge branch 'master' into 'ServerChanges'
- # Conflicts:
# Server/ServerApp/Program.cs - 09:10 Revize 7c7d7ad3 (aswi2021tri-musketyri-gitlab): Merge branch 'TestingParser' into 'master'
- Testing parser
See merge request aswi/aswi-2021/aswi2021tri-musketyri!11 - 09:05 Revize 2a7f543a (aswi2021tri-musketyri-gitlab): Re #8829 Added heatmap visualization
2021-05-16
- 21:24 Revize 662b2404 (aswi2021tri-musketyri-gitlab): Re #8832 integration
- 17:33 Revize 4129ce12 (aswi2021tri-musketyri-gitlab): Re #8838. Started refining commands accepting + modified GetData in DataDownloader.
- 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 - 17:08 Revize f4d8507f (aswi2021tri-musketyri-gitlab): Merge branch 'predictor' into 'TestingParser'
- # Conflicts:
# Server/ServerApp/Program.cs - 13:56 Revize e75e6857 (aswi2021tri-musketyri-gitlab): Re #8831 Changed deserialization
- 11:58 Revize 6b4c34a2 (aswi2021tri-musketyri-gitlab): Re #8836. Added XML protocol building / parsing.
- 10:20 Revize 4cb8ae48 (aswi2021tri-musketyri-gitlab): re #8842 Fixing MergeAttendance
- 09:43 Revize 99e5517e (aswi2021tri-musketyri-gitlab): re #8842 Start testing
2021-05-15
- 20:40 Revize ebe96ca4 (aswi2021tri-musketyri-gitlab): Re #8832 PredictionController implementation
- 13:03 Revize 3cb70579 (aswi2021tri-musketyri-gitlab): Added communication model and XML serialization
2021-05-14
- 21:51 Revize 755c25f3 (aswi2021tri-musketyri-gitlab): Upload first consistent client demo
- 19:36 Revize 3e283a5f (aswi2021tri-musketyri-gitlab): Merge branch 'NBC' into 'master'
- Re #8832 Refactoring
See merge request aswi/aswi-2021/aswi2021tri-musketyri!9 - 14:13 Revize 1216a2e3 (aswi2021tri-musketyri-gitlab): Merge branch 'JsonParser' into 'master'
- Json parser
See merge request aswi/aswi-2021/aswi2021tri-musketyri!8 - 14:11 Revize 9fb55c71 (aswi2021tri-musketyri-gitlab): re #8840 Update commit - start/endTime in method Parse in DataParser can now be null
2021-05-12
2021-05-11
- 12:23 Revize 4977ce53 (aswi2021tri-musketyri-gitlab): Re #8832 Refactoring
- Refactored existing classes to comply with the coding conventions
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
- 09:05 Revize c0dffb79 (aswi2021tri-musketyri-gitlab): re #8840 Fixing day changes in list of predictions
- 08:51 Revize 1407c8ba (aswi2021tri-musketyri-gitlab): re #8840 Finishing up Json parser
2021-05-07
Také k dispozici: Atom