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

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

2021-05-24

12:46 Revize 861c0129 (aswi2021vochomurka-gitlab): Merge branch 'feature/8921_preferences_dialog' into 'develop'

Feature/8921 preferences dialog
See merge request aswi/aswi-2021/aswi2021vochomurka!18 Martin Forejt

12:46 Revize be89639f (aswi2021vochomurka-gitlab): Feature/8921 preferences dialog

Martin Forejt

08:31 Revize 0f40fffe (aswi2021vochomurka-gitlab): Merge branch 'feature/8923_grid_layout' into 'develop'

Feature/8923 grid layout
See merge request aswi/aswi-2021/aswi2021vochomurka!17 Jan Rach

08:31 Revize ab7ab78d (aswi2021vochomurka-gitlab): Feature/8923 grid layout

Jan Rach

2021-05-19

20:09 Revize 847100d1 (aswi2021vochomurka-gitlab): Re: #8923 - add scroll, button to graph

Martin Forejt

11:55 Revize 70b83aa2 (aswi2021vochomurka-gitlab): Re #8923 - Graphs displayed separately in a grid layout.

Jan Rach

2021-05-17

16:03 Revize 9b822fd1 (aswi2021vochomurka-gitlab): Re: #8921 - refactoring

Martin Forejt

16:02 Revize ab2986f2 (aswi2021vochomurka-gitlab): Re: #8921 - remove question mark from dialog title

Martin Forejt

15:43 Revize 9fa4dbaf (aswi2021vochomurka-gitlab): Re: #8921 - refactoring

Martin Forejt

15:42 Revize fd159c79 (aswi2021vochomurka-gitlab): Re: #8921 - refactoring

Martin Forejt

15:36 Revize 3b3b9e9b (aswi2021vochomurka-gitlab): Re: #8921 - use configuration from QSettings

Martin Forejt

15:06 Revize 7d28568e (aswi2021vochomurka-gitlab): Re: #8921 - settings dialog

Martin Forejt

12:10 Revize 0238d907 (aswi2021vochomurka-gitlab): Merge branch 'develop'

# Conflicts:
# aswi2021vochomurka/service/file_manager.py
# aswi2021vochomurka/service/mqtt/mqtt_subscrib... Martin Forejt

12:06 Revize 000a03b7 (aswi2021vochomurka-gitlab): Re: #8921 - menubar with empty dialogs

Martin Forejt

2021-05-14

10:23 Revize 07056ae3 (aswi2021vochomurka-gitlab): Merge branch 'feature/8893_loggin_to_file' into 'develop'

Feature/8893 loggin to file
See merge request aswi/aswi-2021/aswi2021vochomurka!14 Martin Forejt

10:23 Revize 21e4cc2f (aswi2021vochomurka-gitlab): Feature/8893 loggin to file

Martin Forejt

10:20 Revize 989559d2 (aswi2021vochomurka-gitlab): Merge branch 'fix/revert_merge' into 'develop'

Revert "Merge branch 'feature/8892_gui_scrollbar' into 'develop'"
See merge request aswi/aswi-2021/aswi2021vochomurk... Martin Forejt

10:18 Revize 1b7d8783 (aswi2021vochomurka-gitlab): Re: #8892 - refactor

Martin Forejt

10:07 Revize 681857e8 (aswi2021vochomurka-gitlab): Revert "Merge branch 'feature/8892_gui_scrollbar' into 'develop'"

This reverts commit a79efbfdd461df5544acee26155b3bd5358e926d, reversing
changes made to bf5cef2fc200c10d6fb596287b111... Martin Forejt

09:56 Revize a79efbfd (aswi2021vochomurka-gitlab): Merge branch 'feature/8892_gui_scrollbar' into 'develop'

Re: #8892 - scrollbar added
See merge request aswi/aswi-2021/aswi2021vochomurka!12 Martin Forejt

2021-05-12

12:23 Revize 170f1cb8 (aswi2021vochomurka-gitlab): Re: #8892 - scrollbar added

Pavel Průcha

12:09 Revize bf5cef2f (aswi2021vochomurka-gitlab): Merge branch 'feature/8854_graphs_update' into 'develop'

Re: #8854 - Graphs update
See merge request aswi/aswi-2021/aswi2021vochomurka!11 Jan Rach

12:04 Revize b0714d86 (aswi2021vochomurka-gitlab): Re: #8854 - Graphs update

Jan Rach

2021-05-10

12:59 Revize 177b96f0 (aswi2021vochomurka-gitlab): Re: #8893 - connect logger view with logger

Martin Forejt

12:20 Revize 9187b769 (aswi2021vochomurka-gitlab): Re: #8893 - add log messages

Martin Forejt

11:37 Revize 3d86c8ef (aswi2021vochomurka-gitlab): Re: #8893 - init logger

Martin Forejt

2021-05-06

15:30 Revize 82e60924 (aswi2021vochomurka-gitlab): Merge branch 'develop' into 'master'

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

15:30 Revize 6eb2b40e (aswi2021vochomurka-gitlab): frontend

- layout
- adding new random graph for every new message Martin Forejt

15:30 Revize 79418b2c (aswi2021vochomurka-gitlab): Merge branch 'fix/merge_master_it4' into 'develop'

Fix/merge master it4
See merge request aswi/aswi-2021/aswi2021vochomurka!9 Martin Forejt

15:25 Revize 02e0c8cf (aswi2021vochomurka-gitlab): Merge branch 'master' into develop

# Conflicts:
# aswi2021vochomurka/main.py
# aswi2021vochomurka/service/mqtt/mqtt_subscriber.py
# as... Martin Forejt

15:21 Revize 561e2562 (aswi2021vochomurka-gitlab): Merge branch 'feature/8731_files' into 'develop'

Feature/8731 files
See merge request aswi/aswi-2021/aswi2021vochomurka!7 Martin Forejt

15:21 Revize 57cc3beb (aswi2021vochomurka-gitlab): Feature/8731 files

Martin Forejt