Commit Graph

12 Commits

Author SHA1 Message Date
DYefremov
5b12777223 Merge branch 'development-mac' into experimental-win
# Conflicts:
#	DemonEditor.spec
#	app/tools/media.py
#	app/ui/dialogs.glade
#	app/ui/main_app_window.py
#	app/ui/main_window.glade
#	app/ui/satellites_dialog.glade
#	app/ui/settings_dialog.glade
#	app/ui/settings_dialog.py
#	app/ui/uicommons.py
2021-04-02 21:51:05 +03:00
DYefremov
b60a9a69b6 minor fix for epg 2021-03-14 20:15:34 +03:00
DYefremov
653ef1422f some minor fixes 2021-03-06 14:32:33 +03:00
DYefremov
954f1c514a alt service timer delete/edit fix 2021-02-09 20:23:57 +03:00
DYefremov
bbffeaa30e added epg display from the alternatives list 2021-01-21 19:16:22 +03:00
DYefremov
558843c728 set extra tools visible by default 2021-01-08 13:17:16 +03:00
DYefremov
0b4313e4cf minor changes in control panel gui 2020-11-27 21:25:00 +03:00
DYefremov
39cc0ad8b3 some changes in the control panel 2020-11-26 13:51:46 +03:00
DYefremov
94dfda0fa2 added basic support for timers via http api 2020-11-26 13:40:36 +03:00
DYefremov
d18734910d small http api refactoring 2020-11-26 13:36:45 +03:00
DYefremov
d843633043 added epg display in control panel 2020-11-26 13:28:16 +03:00
DYefremov
b513d7a9b0 added prototype of simple control panel (#38) 2020-11-26 13:09:55 +03:00