Projekt

Obecné

Profil

Aktivita

Od 2021-04-21 do 2021-05-20

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á

2021-04-28

23:45 Revize e426de23 (aswi2021tri-musketyri-gitlab): Re #8686 Testing a networking solution
Zuzana Káčereková
06:17 Revize 55d35561 (aswi2021tri-musketyri-gitlab): Re #8691. Implemented downloaded data retrieving.
Eliška Mourycová
00:04 Revize 62a48ad4 (aswi2021tri-musketyri-gitlab): Re #8685 Android server connection test
Zuzana Káčereková

2021-04-26

21:51 Revize 2d2b8d48 (aswi2021tri-musketyri-gitlab): Re #8685 Prototype base
Zuzana Káčereková
19:33 Revize 085453be (aswi2021tri-musketyri-gitlab): Re #8691. Working on retrieving data in time span from a directory.
Eliška Mourycová
18:15 Revize d39750f3 (aswi2021tri-musketyri-gitlab): re #8682 Modified parser to aggregate data according to buildings. Also added a method that merges information about jis and webauth activity into one list.
Alex Konig
12:58 Revize 4a417b8b (aswi2021tri-musketyri-gitlab): Re #8691. Url config improvements + thread for commands accepting prepared.
Eliška Mourycová
08:54 Revize 7a998d66 (aswi2021tri-musketyri-gitlab): Re #8691. Big refactor + config file added + working on providing methods for Parser.
Eliška Mourycová

2021-04-23

18:32 Revize a6583091 (aswi2021tri-musketyri-gitlab): re #8682 Changed tags
Alex Konig

2021-04-21

17:59 Revize cb0b7cb9 (aswi2021tri-musketyri-gitlab): re #8683 Fixing project dependencies problems
Alex Konig
17:35 Revize 066a106f (aswi2021tri-musketyri-gitlab): Delete .suo
Roman Kalivoda
17:27 Revize 57a75f60 (aswi2021tri-musketyri-gitlab): re #8683 clean after merge
Roman Kalivoda
16:25 Revize 7cb76834 (aswi2021tri-musketyri-gitlab): Merge branch 'dataDownload_connection' into 'master'
Data download connection
See merge request aswi/aswi-2021/aswi2021tri-musketyri!4 Alex Konig
16:24 Revize fa2db1ee (aswi2021tri-musketyri-gitlab): Merge branch 'master' into 'dataDownload_connection'
# Conflicts:
# Server/ServerApp/Program.cs
# Server/ServerApp/ServerApp.csproj Alex Konig
16:18 Revize bc9c38b8 (aswi2021tri-musketyri-gitlab): Merge branch 'NBC' into 'master'
Nbc
See merge request aswi/aswi-2021/aswi2021tri-musketyri!3 Alex Konig
16:16 Revize b557d72f (aswi2021tri-musketyri-gitlab): Merge branch 'ServerParsing' into 'master'
Server parsing
See merge request aswi/aswi-2021/aswi2021tri-musketyri!2 Alex Konig
16:16 Revize 3977351b (aswi2021tri-musketyri-gitlab): Merge branch 'master' into 'ServerParsing'
# Conflicts:
# Server/ServerApp.sln
# Server/ServerApp/Parser/InputData/CsvDataLoader.cs
# Server/ServerApp/Par... Alex Konig
 

Také k dispozici: Atom