Commit Graph

337 Commits

Author SHA1 Message Date
martii
155c0ba036 adzap: port code from martiis-neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: c015d4670f
Author: martii <m4rtii@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- adzap: port code from martiis-neutrino-mp

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-03 11:18:14 +01:00
vanhofen
ed757e69fe neutrino: add version_pseudo.h to allow changes ...
by comparing old version_pseudo with new one


Origin commit data
------------------
Branch: ni/coolstream
Commit: 273dc68da5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- neutrino: add version_pseudo.h to allow changes ...

by comparing old version_pseudo with new one


------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Michael Liebmann
4f41565587 movieplayer: Use Lua scripts for selecting live stream urls
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4a2856e1c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
vanhofen
7bbba0b922 movieplayer/browser: add user key to create/remove movie cover
Origin commit data
------------------
Branch: ni/coolstream
Commit: 61a4b3bf9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-11 (Thu, 11 Feb 2016)

Origin message was:
------------------
- movieplayer/browser: add user key to create/remove movie cover

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-02-11 15:04:11 +01:00
vanhofen
8f732da465 moviebrowser: introduce user-assignable keys
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab82c36b9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-09 (Tue, 09 Feb 2016)

Origin message was:
------------------
- moviebrowser: introduce user-assignable keys

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-02-09 15:53:56 +01:00
vanhofen
e082799691 moviebrowser: add possibility to search for movies in SMS-style
This feature has to be activated first. Menu -> Settings ->
Key Setup -> Edit -> My recordings

In moviebrowser press three times key "3" to select first movie
title starting with a "F" or press two times "6" to select first
movie title starting with a "N".

The new item in keybind-setup is the first step to introduce user-
assignable keys in moviebrowser. So finally the horrible hotkeys
for the cutting functions can be removed and/or replaced.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a98143e49
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-09 (Tue, 09 Feb 2016)

Origin message was:
------------------
- moviebrowser: add possibility to search for movies in SMS-style

This feature has to be activated first. Menu -> Settings ->
Key Setup -> Edit -> My recordings

In moviebrowser press three times key "3" to select first movie
title starting with a "F" or press two times "6" to select first
movie title starting with a "N".

The new item in keybind-setup is the first step to introduce user-
assignable keys in moviebrowser. So finally the horrible hotkeys
for the cutting functions can be removed and/or replaced.


------------------
This commit was generated by Migit
2016-02-09 12:05:28 +01:00
Michael Liebmann
b46710d6a8 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: db8a9e6388
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-25 13:20:10 +01:00
vanhofen
b1177424b5 vfd: allow to disable rc-lock message on vfd
Origin commit data
------------------
Branch: ni/coolstream
Commit: b56f4ed149
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)

Origin message was:
------------------
- vfd: allow to disable rc-lock message on vfd

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-25 08:04:35 +01:00
Stefan Seyfried
a28613ab99 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-01 14:10:48 +01:00
vanhofen
3b47fa1c0d add menu item to force usertitles for color buttons in infobar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3107e621ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)

Origin message was:
------------------
- add menu item to force usertitles for color buttons in infobar

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-29 14:31:52 +01:00
Stefan Seyfried
0a95a07654 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-28 16:15:14 +01:00
Thilo Graf
1f005ea369 COPKGManager: remember for last selected update directory
Use g_settings to handle local package directory.
Extra settings handler via gui for this directory is not intended. Default update directory
is the same like in flash settings.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1606cf8a30
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-11-28 (Fri, 28 Nov 2014)



------------------
This commit was generated by Migit
2015-12-28 12:13:38 +01:00
Thilo Graf
165cabba18 Screensaver: add option to show current time instead images
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b3576b4a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-27 22:26:23 +01:00
Thilo Graf
1dedce338b Screeansaver: add optional random images
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff667dfef3
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-27 19:46:14 +01:00
Thilo Graf
9f101bddbc Colors: init global color gradient implementation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 523b273af8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-19 (Thu, 19 Nov 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-27 14:42:27 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
[CST] Focus
973549a293 neutrino: add option to limit CI usage to selected tuner
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a8fc39ef9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-11-05 (Thu, 05 Nov 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-11-06 17:24:10 +03:00
[CST] Focus
29037b3941 gui/cam_menu.cpp: hack: save blind answer as pincode and re-use it if enabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04aa958d19
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-09-24 (Thu, 24 Sep 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-09-24 12:32:28 +03:00
Michael Liebmann
1cac7299e4 Apollo/Kronos: Use backup with readmtdJFFS2() also for root1 partition
Origin commit data
------------------
Branch: ni/coolstream
Commit: cb4c7431c7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-22 (Tue, 22 Sep 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-09-22 13:41:14 +02:00
Michael Liebmann
c6a526cbc4 Apollo/Kronos: Use backup with readmtdJFFS2() also for var partition
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6121e57fbc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-22 (Tue, 22 Sep 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-09-22 13:41:13 +02:00
vanhofen
7278d8f00e infoviewer_bb: add own color for CA-bar
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd6ad52c8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-17 (Wed, 17 Jun 2015)

Origin message was:
------------------
- infoviewer_bb: add own color for CA-bar

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-06-18 21:18:32 +02:00
vanhofen
d90aa919c1 infoviewer_bb: show/hide dotmatrix in CA-bar; default show
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59e2143e00
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-17 (Wed, 17 Jun 2015)

Origin message was:
------------------
- infoviewer_bb: show/hide dotmatrix in CA-bar; default show

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-06-18 21:18:32 +02:00
vanhofen
f942f65e70 infoviewer_bb: add frame to CA-bar; default off
Origin commit data
------------------
Branch: ni/coolstream
Commit: 398dfeeab1
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-17 (Wed, 17 Jun 2015)

Origin message was:
------------------
- infoviewer_bb: add frame to CA-bar; default off

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-06-18 21:18:32 +02:00
FlatTV
2816525c84 ytparser: fix youtube playback; change to APIv3
Origin commit data
------------------
Branch: ni/coolstream
Commit: acf3453fcd
Author: FlatTV <FlatTV@gmx.de>
Date: 2015-06-01 (Mon, 01 Jun 2015)

Origin message was:
------------------
- ytparser: fix youtube playback; change to APIv3

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-06-01 12:36:15 +02:00
vanhofen
f26b53d4ad start_wizard: use a global enum; switch detection from bool to int
Origin commit data
------------------
Branch: ni/coolstream
Commit: af90286a30
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-15 (Fri, 15 May 2015)

Origin message was:
------------------
- start_wizard: use a global enum; switch detection from bool to int

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-15 03:46:50 +02:00
Jacek Jendrzej
0e14a92cbf webtv: use last dir as default
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cc4120672
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-05-12 (Tue, 12 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-12 18:16:36 +02:00
[CST] Focus
bc289e1a22 gui/themes.cpp: add option to switch one/two color gradient mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76fa4bc221
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-07 (Thu, 07 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-07 16:38:29 +03:00
vanhofen
d248f4b7c4 themes: move colored_events settings to themes setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: cb5f052e83
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- themes: move colored_events settings to themes setup

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-05 11:43:17 +02:00
vanhofen
c1c0c51126 infoviewer: add color-to-color gradient feature; THX to TangoCash ...
... for basic inspiration and dbt for some optimizations


Origin commit data
------------------
Branch: ni/coolstream
Commit: 62daf1dc4c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- infoviewer: add color-to-color gradient feature; THX to TangoCash ...

... for basic inspiration and dbt for some optimizations


------------------
This commit was generated by Migit
2015-05-04 09:41:41 +02:00
Thilo Graf
946c0e8bc4 Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-30 09:20:43 +02:00
Thilo Graf
cefb8f9594 themes: use hintbox and header gradient option in theme settings
Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 01516cf943
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Origin message was:
------------------
themes: use hintbox and header gradient option in theme settings

Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


------------------
This commit was generated by Migit
2015-04-29 10:16:55 +02:00
vanhofen
a8bbb6f393 add missing includes to fix menu-width
strange circular include global.h <-> settings.h is maybe to fix


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e15577bf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)

Origin message was:
------------------
- add missing includes to fix menu-width

 strange circular include global.h <-> settings.h is maybe to fix


------------------
This commit was generated by Migit
2015-04-16 18:36:17 +02:00
vanhofen
21b3e320aa channellist: allow show/hide bottom infobox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f35a67426
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Origin message was:
------------------
- channellist: allow show/hide bottom infobox

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-14 11:08:24 +02:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
[CST] Focus
7f0ac9a93b gui/miscsettings_menu.cpp: add option to cache EPG only for favorite channels,
filter not yet reconfigured after scan or editing favorite bouquets


Origin commit data
------------------
Branch: ni/coolstream
Commit: d98d94550f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)



------------------
This commit was generated by Migit
2015-01-22 18:58:53 +03:00
vanhofen
4aad5781c9 screensaver: remove audioplayer_screensaver; add screensaver_delay
Origin commit data
------------------
Branch: ni/coolstream
Commit: df18f1f4e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- screensaver: remove audioplayer_screensaver; add screensaver_delay

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-12-29 23:50:18 +01:00
vanhofen
098a5ba944 screensaver: add GUI option to change timeout
Origin commit data
------------------
Branch: ni/coolstream
Commit: 153e7dba91
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- screensaver: add GUI option to change timeout

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-12-29 22:13:02 +01:00
defans
1b117eb41e CScreenSaver: add class CScreenSaver
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a23a1c36a
Author: defans <defans@bluepeercrew.us>
Date: 2014-12-29 (Mon, 29 Dec 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-12-29 22:13:02 +01:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01:00
Stefan Seyfried
d451d7950e remove obsolete g_info.delivery_system
Origin commit data
------------------
Branch: ni/coolstream
Commit: 20363fa8fd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-12-25 18:13:48 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
[CST] Focus
33348df25f gui/scan_setup.cpp: add pilot param to manual scan menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 34691a1724
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-12-18 17:31:55 +03:00
[CST] Focus
81086d87b2 gui/videosettings.cpp: split format key modes and auto-modes on apollo,
disable broken 14:9 pan&scan on apollo


Origin commit data
------------------
Branch: ni/coolstream
Commit: 68e240b4e7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-04 (Thu, 04 Dec 2014)



------------------
This commit was generated by Migit
2014-12-18 17:31:48 +03:00
vanhofen
2ae96ef599 add epg_save_frequently feature ...
... to provide the EPG data in frequently intervals on an external device


Origin commit data
------------------
Branch: ni/coolstream
Commit: e21a79195e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-04 (Thu, 04 Dec 2014)

Origin message was:
------------------
- add epg_save_frequently feature ...

... to provide the EPG data in frequently intervals on an external device


------------------
This commit was generated by Migit
2014-12-05 09:08:56 +01:00
vanhofen
580de8ec3b split epg_read from epg_save ...
... to get the possibility to read EPG-data from an external device
at boot w/o saving the own data at shutdown/standby.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c621f1dec
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-04 (Thu, 04 Dec 2014)

Origin message was:
------------------
- split epg_read from epg_save ...

... to get the possibility to read EPG-data from an external device
at boot w/o saving the own data at shutdown/standby.


------------------
This commit was generated by Migit
2014-12-05 09:08:56 +01:00
Michael Liebmann
9db3dc37d4 Fix commit c2d1b3968b for build on nevis
Origin commit data
------------------
Branch: ni/coolstream
Commit: e964a13763
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-11-24 (Mon, 24 Nov 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-24 17:45:20 +01:00
martii
c2d1b3968b zapit/audio_setup: add gui option for handling volume adjustment defaults
Origin commit data
------------------
Branch: ni/coolstream
Commit: 421da2c0cf
Author: martii <m4rtii@gmx.de>
Date: 2013-06-21 (Fri, 21 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-24 11:47:04 +01:00
martii
2df91f2e87 parental protection: make zaptime configurable
Conflicts:
	data/locale/english.locale
	src/gui/channellist.cpp
	src/gui/parentallock_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a12f4c0274
Author: martii <m4rtii@gmx.de>
Date: 2013-06-23 (Sun, 23 Jun 2013)



------------------
This commit was generated by Migit
2014-11-11 14:40:52 +03:00
[CST] Focus
07d6899667 gui/miscsettings_menu.cpp: add option to enable/disable empty favorites in bouquet list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8772d219f1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-10-27 13:52:23 +03:00
[CST] Focus
91c68d2a47 gui/update_settings.cpp: add option to enable/disable updates check on boot
Origin commit data
------------------
Branch: ni/coolstream
Commit: c43438baec
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-20 (Mon, 20 Oct 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-10-20 14:20:26 +04:00