ASWI - Pokročilé softwarové inženýrství » ASWI 2021 » Konfigurovatelný dashboard zobrazování senzorových dat (KIV) - Vochomůrka

2021-06-09

10:22 Revize 5835740e (aswi2021vochomurka-gitlab): Merge branch 'develop'

# Conflicts:
# aswi2021vochomurka/view/main_view.py Martin Forejt

2021-06-06

20:42 Revize 33ed7032 (aswi2021vochomurka-gitlab): Merge branch 'support/8994_documentation' into 'develop'

Re: #8994 - Documentation
See merge request aswi/aswi-2021/aswi2021vochomurka!31 Milan Kohoutek

20:40 Revize 48dd3f97 (aswi2021vochomurka-gitlab): Re: #8994 - Documentation

Milan Kohoutek

19:31 Revize 89639a43 (aswi2021vochomurka-gitlab): Merge branch 'feature/8968_adjustments' into 'develop'

Re: #8968 - adjustments for plot focus button
See merge request aswi/aswi-2021/aswi2021vochomurka!30 Jan Rach

19:30 Revize 81e08f8f (aswi2021vochomurka-gitlab): Re: #8968 - adjustments for plot focus button

Jan Rach

2021-06-05

22:32 Revize 932ac254 (aswi2021vochomurka-gitlab): Merge branch 'develop' into 'master'

Develop
See merge request aswi/aswi-2021/aswi2021vochomurka!29 Martin Forejt

22:32 Revize 64ca87d0 (aswi2021vochomurka-gitlab): Develop

Martin Forejt

2021-06-04

11:26 Revize 8f88c18d (aswi2021vochomurka-gitlab): Merge branch 'feature/build' into 'develop'

Feature/build
See merge request aswi/aswi-2021/aswi2021vochomurka!28 Martin Forejt

11:26 Revize 068e1869 (aswi2021vochomurka-gitlab): Feature/build

Martin Forejt

07:58 Revize 96f1e8aa (aswi2021vochomurka-gitlab): Merge branch 'feature/8968_delete' into 'develop'

Re: #8968 - second function delete feature implemented.
See merge request aswi/aswi-2021/aswi2021vochomurka!27 Jan Rach

07:56 Revize e89316f6 (aswi2021vochomurka-gitlab): Re: #8968 - second function delete feature implemented.

Jan Rach

2021-06-03

15:31 Revize a8ff48c9 (aswi2021vochomurka-gitlab): Merge branch 'feature/8968_logging' into 'develop'

Re: #8968 - logging error
See merge request aswi/aswi-2021/aswi2021vochomurka!26 Jan Rach

15:30 Revize e91c91d8 (aswi2021vochomurka-gitlab): Re: #8968 - logging error

Jan Rach

15:16 Revize 9bbf0e6d (aswi2021vochomurka-gitlab): Merge branch 'feature/8968_second_function' into 'develop'

Re: #8968 - second function plotting implemented
See merge request aswi/aswi-2021/aswi2021vochomurka!25 Jan Rach

15:15 Revize 4e32720c (aswi2021vochomurka-gitlab): Re: #8968 - second function plotting implemented

Jan Rach

10:10 Revize 7c7cf1b9 (aswi2021vochomurka-gitlab): Merge branch 'feature/8998_refactoring_fe' into 'develop'

Merge branch 'feature/8998_refactoring_fe' into 'develop'
See merge request aswi/aswi-2021/aswi2021vochomurka!24 Pavel Průcha

09:57 Revize e402bc71 (aswi2021vochomurka-gitlab): Re: #8998 - refactoring, comments

Pavel Průcha

2021-06-02

13:32 Revize 46d23dcf (aswi2021vochomurka-gitlab): Merge branch 'feature/9016_delete_graph' into 'develop'

Re: #9016 - Topic close plot reaction implemented
See merge request aswi/aswi-2021/aswi2021vochomurka!23 Jan Rach

12:46 Revize ff2d1b99 (aswi2021vochomurka-gitlab): Re: #9016 - Topic close plot reaction implemented

Jan Rach

2021-05-28

11:15 Revize 96d392e6 (aswi2021vochomurka-gitlab): Merge branch 'feature/9017_graph_title' into 'develop'

Feature/9017 graph title
See merge request aswi/aswi-2021/aswi2021vochomurka!22 Jan Rach

11:15 Revize c9bff745 (aswi2021vochomurka-gitlab): Feature/9017 graph title

Jan Rach

2021-05-27

22:40 Revize 00c37371 (aswi2021vochomurka-gitlab): Merge branch 'fix/load_timeout_as_int' into 'develop'

fix: load timeout from ini file as int
See merge request aswi/aswi-2021/aswi2021vochomurka!21 Martin Forejt

22:40 Revize 7d3e8585 (aswi2021vochomurka-gitlab): fix: load timeout from ini file as int

Martin Forejt

22:21 Revize 68ce20d6 (aswi2021vochomurka-gitlab): Merge branch 'feature/8997_refactoring_be' into 'develop'

Re: #8997 - refactoring, comments
See merge request aswi/aswi-2021/aswi2021vochomurka!20 Martin Forejt

22:21 Revize 523382c1 (aswi2021vochomurka-gitlab): Re: #8997 - refactoring, comments

Martin Forejt

21:56 Revize 77d63a12 (aswi2021vochomurka-gitlab): Merge branch 'feature/8996_config_file_location' into 'develop'

Feature/8996 config file location
See merge request aswi/aswi-2021/aswi2021vochomurka!19 Martin Forejt

21:56 Revize f727f55f (aswi2021vochomurka-gitlab): Feature/8996 config file location

Martin Forejt

21:52 Revize f1aeaed0 (aswi2021vochomurka-gitlab): Re: 8996 - add default config file

Martin Forejt

21:52 Revize bde53a5c (aswi2021vochomurka-gitlab): Re: 8996 - config file format and location

Martin Forejt