Projekt

Obecné

Profil

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

aswi2021vochomurka-gitlab @ 21e4cc2f

# Datum Autor Komentář
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
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