Projekt

Obecné

Profil

Statistiky
| Větev: | Tag: | Revize:

aswi2021vochomurka-gitlab @ master

# Datum Autor Komentář
5835740e 2021-06-09 10:22 Martin Forejt

Merge branch 'develop'

  1. Conflicts:
  2. aswi2021vochomurka/view/main_view.py
33ed7032 2021-06-06 20:42 Milan Kohoutek

Merge branch 'support/8994_documentation' into 'develop'

Re: #8994 - Documentation

See merge request aswi/aswi-2021/aswi2021vochomurka!31
48dd3f97 2021-06-06 20:40 Milan Kohoutek

Re: #8994 - Documentation
89639a43 2021-06-06 19:31 Jan Rach

Merge branch 'feature/8968_adjustments' into 'develop'

Re: #8968 - adjustments for plot focus button

See merge request aswi/aswi-2021/aswi2021vochomurka!30
81e08f8f 2021-06-06 19:30 Jan Rach

Re: #8968 - adjustments for plot focus button
932ac254 2021-06-05 22:32 Martin Forejt

Merge branch 'develop' into 'master'

Develop

See merge request aswi/aswi-2021/aswi2021vochomurka!29
64ca87d0 2021-06-05 22:32 Martin Forejt

Develop
8f88c18d 2021-06-04 11:26 Martin Forejt

Merge branch 'feature/build' into 'develop'

Feature/build

See merge request aswi/aswi-2021/aswi2021vochomurka!28
068e1869 2021-06-04 11:26 Martin Forejt

Feature/build
96f1e8aa 2021-06-04 07:58 Jan Rach

Merge branch 'feature/8968_delete' into 'develop'

Re: #8968 - second function delete feature implemented.

See merge request aswi/aswi-2021/aswi2021vochomurka!27
e89316f6 2021-06-04 07:56 Jan Rach

Re: #8968 - second function delete feature implemented.
a8ff48c9 2021-06-03 15:31 Jan Rach

Merge branch 'feature/8968_logging' into 'develop'

Re: #8968 - logging error

See merge request aswi/aswi-2021/aswi2021vochomurka!26
e91c91d8 2021-06-03 15:30 Jan Rach

Re: #8968 - logging error
9bbf0e6d 2021-06-03 15:16 Jan Rach

Merge branch 'feature/8968_second_function' into 'develop'

Re: #8968 - second function plotting implemented

See merge request aswi/aswi-2021/aswi2021vochomurka!25
4e32720c 2021-06-03 15:15 Jan Rach

Re: #8968 - second function plotting implemented
7c7cf1b9 2021-06-03 10:10 Pavel Průcha

Merge branch 'feature/8998_refactoring_fe' into 'develop'

Merge branch 'feature/8998_refactoring_fe' into 'develop'

See merge request aswi/aswi-2021/aswi2021vochomurka!24
e402bc71 2021-06-03 09:57 Pavel Průcha

Re: #8998 - refactoring, comments
46d23dcf 2021-06-02 13:32 Jan Rach

Merge branch 'feature/9016_delete_graph' into 'develop'

Re: #9016 - Topic close plot reaction implemented

See merge request aswi/aswi-2021/aswi2021vochomurka!23
ff2d1b99 2021-06-02 12:46 Jan Rach

Re: #9016 - Topic close plot reaction implemented
96d392e6 2021-05-28 11:15 Jan Rach

Merge branch 'feature/9017_graph_title' into 'develop'

Feature/9017 graph title

See merge request aswi/aswi-2021/aswi2021vochomurka!22
c9bff745 2021-05-28 11:15 Jan Rach

Feature/9017 graph title
00c37371 2021-05-27 22:40 Martin Forejt

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
7d3e8585 2021-05-27 22:40 Martin Forejt

fix: load timeout from ini file as int
68ce20d6 2021-05-27 22:21 Martin Forejt

Merge branch 'feature/8997_refactoring_be' into 'develop'

Re: #8997 - refactoring, comments

See merge request aswi/aswi-2021/aswi2021vochomurka!20
523382c1 2021-05-27 22:21 Martin Forejt

Re: #8997 - refactoring, comments
77d63a12 2021-05-27 21:56 Martin Forejt

Merge branch 'feature/8996_config_file_location' into 'develop'

Feature/8996 config file location

See merge request aswi/aswi-2021/aswi2021vochomurka!19
f727f55f 2021-05-27 21:56 Martin Forejt

Feature/8996 config file location
861c0129 2021-05-24 12:46 Martin Forejt

Merge branch 'feature/8921_preferences_dialog' into 'develop'

Feature/8921 preferences dialog

See merge request aswi/aswi-2021/aswi2021vochomurka!18
be89639f 2021-05-24 12:46 Martin Forejt

Feature/8921 preferences dialog
0f40fffe 2021-05-24 08:31 Jan Rach

Merge branch 'feature/8923_grid_layout' into 'develop'

Feature/8923 grid layout

See merge request aswi/aswi-2021/aswi2021vochomurka!17
ab7ab78d 2021-05-24 08:31 Jan Rach

Feature/8923 grid layout
0238d907 2021-05-17 12:10 Martin Forejt

Merge branch 'develop'

  1. Conflicts:
  2. aswi2021vochomurka/service/file_manager.py
  3. aswi2021vochomurka/service/mqtt/mqtt_subscriber.py
07056ae3 2021-05-14 10:23 Martin Forejt

Merge branch 'feature/8893_loggin_to_file' into 'develop'

Feature/8893 loggin to file

See merge request aswi/aswi-2021/aswi2021vochomurka!14
21e4cc2f 2021-05-14 10:23 Martin Forejt

Feature/8893 loggin to file
989559d2 2021-05-14 10:20 Martin Forejt

Merge branch 'fix/revert_merge' into 'develop'

Revert "Merge branch 'feature/8892_gui_scrollbar' into 'develop'"

See merge request aswi/aswi-2021/aswi2021vochomurka!13
681857e8 2021-05-14 10:07 Martin Forejt

Revert "Merge branch 'feature/8892_gui_scrollbar' into 'develop'"

This reverts commit a79efbfdd461df5544acee26155b3bd5358e926d, reversing
changes made to bf5cef2fc200c10d6fb596287b111c6b352be1e7.
a79efbfd 2021-05-14 09:56 Martin Forejt

Merge branch 'feature/8892_gui_scrollbar' into 'develop'

Re: #8892 - scrollbar added

See merge request aswi/aswi-2021/aswi2021vochomurka!12
170f1cb8 2021-05-12 12:23 Pavel Průcha

Re: #8892 - scrollbar added
bf5cef2f 2021-05-12 12:09 Jan Rach

Merge branch 'feature/8854_graphs_update' into 'develop'

Re: #8854 - Graphs update

See merge request aswi/aswi-2021/aswi2021vochomurka!11
b0714d86 2021-05-12 12:04 Jan Rach

Re: #8854 - Graphs update
82e60924 2021-05-06 15:30 Martin Forejt

Merge branch 'develop' into 'master'

Develop

See merge request aswi/aswi-2021/aswi2021vochomurka!8
6eb2b40e 2021-05-06 15:30 Martin Forejt

frontend
- layout
- adding new random graph for every new message
79418b2c 2021-05-06 15:30 Martin Forejt

Merge branch 'fix/merge_master_it4' into 'develop'

Fix/merge master it4

See merge request aswi/aswi-2021/aswi2021vochomurka!9
02e0c8cf 2021-05-06 15:25 Martin Forejt

Merge branch 'master' into develop

  1. Conflicts:
  2. aswi2021vochomurka/main.py
  3. aswi2021vochomurka/service/mqtt/mqtt_subscriber.py
  4. aswi2021vochomurka/service/subscriber.py
  5. aswi2021vochomurka/view/main_view.py
  6. poetry.lock...
561e2562 2021-05-06 15:21 Martin Forejt

Merge branch 'feature/8731_files' into 'develop'

Feature/8731 files

See merge request aswi/aswi-2021/aswi2021vochomurka!7
57cc3beb 2021-05-06 15:21 Martin Forejt

Feature/8731 files
74c8e04e 2021-04-27 14:30 Martin Forejt

Merge branch 'develop' into 'master'

Release 1.0.0

See merge request aswi/aswi-2021/aswi2021vochomurka!6
5a79924f 2021-04-27 14:30 Martin Forejt

frontend
- layout
- adding new random graph for every new message
035e9db7 2021-04-27 14:28 Martin Forejt

Merge branch 'feature/8746_gui_charts' into 'develop'

Feature/8746 gui charts

See merge request aswi/aswi-2021/aswi2021vochomurka!5
571579a1 2021-04-27 14:28 Martin Forejt

frontend
- layout
- adding new random graph for every new message
c15ebdfe 2021-04-27 11:07 Martin Forejt

Merge branch 'fix/add_paho_dependency' into 'develop'

added paho dependency to poetry

See merge request aswi/aswi-2021/aswi2021vochomurka!4
47f365dc 2021-04-27 11:06 Martin Forejt

added paho dependency to poetry
0847a040 2021-04-27 10:15 Martin Forejt

Merge branch 'feature/8566_be_fe_interface' into 'develop'

Feature/8566 be fe interface

See merge request aswi/aswi-2021/aswi2021vochomurka!3
91b91053 2021-04-27 10:15 Martin Forejt

Feature/8566 be fe interface
82d14084 2021-04-21 11:33 Martin Forejt

Merge branch 'feature/8566_be_fe_interface' into 'develop'

Re #8566 - setup callback

See merge request aswi/aswi-2021/aswi2021vochomurka!2
2bef6e38 2021-04-21 11:05 Martin Forejt

Re #8566 - setup callback
a7c42394 2021-04-21 09:47 Martin Forejt

Merge branch 'feature/mqtt_demo' into 'develop'

Feature/mqtt demo

See merge request aswi/aswi-2021/aswi2021vochomurka!1
dc7a41b7 2021-04-21 09:47 Martin Forejt

Feature/mqtt demo
306e99cf 2021-03-20 22:36 Martin Forejt

poetry init
e61c422d 2021-03-20 19:43 Martin Forejt

initial commit
bfe7a57a 2021-02-23 13:31 Petr Pícha

Initial commit