Projekt

Obecné

Profil

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

aswi2021vochomurka-gitlab @ 21e4cc2f

Název Velikost
  aswi2021vochomurka
  resources
  tests
.gitignore 1.14 KB
README.md 81 Bajtů
poetry.lock 26.7 KB
pyproject.toml 462 Bajtů

Poslední revize

# 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

Zobrazit všechny revize | Zobrazit revize

Také k dispozici: Atom