Commit Graph

131 Commits

Author SHA1 Message Date
vanhofen
f3ccea3915 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/update_settings.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: aeebd0d444
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)



------------------
This commit was generated by Migit
2017-09-14 16:30:58 +02:00
vanhofen
4dc0113a94 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)



------------------
This commit was generated by Migit
2017-09-14 16:23:15 +02:00
Jacek Jendrzej
8e9b2a2b63 remove unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97442240f8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 13:29:47 +02:00
vanhofen
9b9e405f04 drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
2017-09-13 13:35:23 +02:00
vanhofen
2097d7e876 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
2017-09-13 08:36:25 +02:00
vanhofen
274dbc2d1e drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
2017-09-12 23:46:22 +02:00
vanhofen
e6d2ba00b3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
2017-09-12 22:32:07 +02:00
vanhofen
98ef1d767b move plugin-hide-menu from ni-menu to miscsettings-menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7203f9241
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move plugin-hide-menu from ni-menu to miscsettings-menu

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

------------------
This commit was generated by Migit
2017-09-12 22:30:35 +02:00
vanhofen
fc30d473e8 miscsettings_menu: add new submenu for plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: 732172aeb7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- miscsettings_menu: add new submenu for plugins

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

------------------
This commit was generated by Migit
2017-09-12 22:30:35 +02:00
vanhofen
b318904f89 move lcd4linux-setup from ni-menu to miscsettings-menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: c090a7d253
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move lcd4linux-setup from ni-menu to miscsettings-menu

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

------------------
This commit was generated by Migit
2017-09-12 22:30:35 +02:00
vanhofen
c69e624170 move infoicons-setup from ni-menu to miscsettings-menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91d2193126
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move infoicons-setup from ni-menu to miscsettings-menu

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

------------------
This commit was generated by Migit
2017-09-12 22:30:35 +02:00
vanhofen
514707f0c8 use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: de1ee8b73a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp

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

------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
vanhofen
2aa18cd5e1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)



------------------
This commit was generated by Migit
2017-03-19 01:07:17 +01:00
vanhofen
9d2ce8caf1 use g_info.hw_caps->has_fan; remove old g_info.has_fan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f202b19d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->has_fan; remove old g_info.has_fan

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
0e588328e0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-01 13:10:36 +01:00
vanhofen
c1140e0c1c rename g_PluginList to g_Plugins; this isn't a list of plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: 856c676430
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- rename g_PluginList to g_Plugins; this isn't a list of plugins

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

------------------
This commit was generated by Migit
2017-03-01 13:03:50 +01:00
vanhofen
6df0618eec Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e4c63f289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-13 13:27:49 +01:00
Marc Szymkowiak
c54a158059 add entry to load saved epg data manual
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b2a0d4414
Author: Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
Date: 2017-01-09 (Mon, 09 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-09 19:39:30 +01:00
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
TangoCash
083df328e1 add option to read saved epg data frequently
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6cd5dd8e23
Author: TangoCash <eric@loxat.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-20 19:24:08 +01:00
Thilo Graf
8b6a60f100 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab9bf2ffa6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-02 21:05:36 +01:00
vanhofen
6dfe9dc9ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
2016-11-02 09:50:10 +01:00
vanhofen
4dbb29ed12 miscsettings_menu: fix youtube api key length
Origin commit data
------------------
Branch: ni/coolstream
Commit: da14d72dcb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-01 (Tue, 01 Nov 2016)

Origin message was:
------------------
- miscsettings_menu: fix youtube api key length

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

------------------
This commit was generated by Migit
2016-11-01 22:20:26 +01:00
Thilo Graf
36d8d81fa6 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Branch: ni/coolstream
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
7e6afbf579 allow to disable online services w/o cleaning the keys
Origin commit data
------------------
Branch: ni/coolstream
Commit: db896847b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-08 (Mon, 08 Aug 2016)

Origin message was:
------------------
- allow to disable online services w/o cleaning the keys

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

------------------
This commit was generated by Migit
2016-08-08 23:11:17 +02:00
vanhofen
8cd6181b9c add submenu to configure and control online services like youtube, shoutcast and tmdb
Origin commit data
------------------
Branch: ni/coolstream
Commit: a291b11300
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)

Origin message was:
------------------
- add submenu to configure and control online services like youtube, shoutcast and tmdb

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

------------------
This commit was generated by Migit
2016-08-06 22:52:37 +02:00
Jacek Jendrzej
cd9cb4ba95 remove unused and some clang compil fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 374a172aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-17 13:46:16 +02:00
vanhofen
ecdeaf0566 miscsettings_menu: allow to reset movieplayer plugin
Origin commit data
------------------
Branch: ni/coolstream
Commit: a4bd8cc5a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-22 (Mon, 22 Feb 2016)

Origin message was:
------------------
- miscsettings_menu: allow to reset movieplayer plugin

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

------------------
This commit was generated by Migit
2016-02-22 21:06:46 +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
17528389bf gui/osd_setup.cpp, gui/miscsettings_menu.cpp: do not delete items added to menu - menu dtor do it
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60c45ec06c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-19 (Fri, 19 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-19 15:48:15 +03:00
vanhofen
32365276ef remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.


------------------
This commit was generated by Migit
2015-04-24 09:11:04 +02:00
Stefan Seyfried
c85016eb79 allow choosing bouquets to epg-scan in "favorites only" mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbac5741db
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-04 (Wed, 04 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-04 19:52:25 +01:00
Stefan Seyfried
b741f4f565 miscsettings: use correct SleepTimerWidget invocation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d4c6eedad
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-17 (Tue, 17 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-17 21:18:54 +01: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
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
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
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
[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
f7c9ab84f6 gui/miscsettings_menu.cpp: fix settings sectionsd config
Origin commit data
------------------
Branch: ni/coolstream
Commit: 320c3b163c
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 11:16:14 +04:00
martii
99f9745c97 drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)



------------------
This commit was generated by Migit
2014-09-15 11:44:08 +04:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
vanhofen
f958ebb26d miscsettings_menu: remove double include
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d8814f1d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)

Origin message was:
------------------
- miscsettings_menu: remove double include

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

------------------
This commit was generated by Migit
2014-08-26 17:33:18 +04:00
[CST] Focus
5ee14dabdd merge neutrino-mp menu/buttons/icons changes, (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-17 17:02:25 +04:00
[CST] Focus
92a6be85f7 gui/miscsettings_menu.cpp: move epg scan OFF option to epg mode,
reorder epg settings, add separators


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c22682df3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-14 (Wed, 14 May 2014)



------------------
This commit was generated by Migit
2014-05-14 16:32:49 +04:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
Thilo Graf
bae0f14f3f CMiscMenue: add entry for temporarily debug mode settings
Option "Level" overwrites assigned debug level output mode of Neutrino
start parameters, but only temporarily till change of options by user
or restart of Neutrino.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a8748c5e7
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-08 (Sat, 08 Mar 2014)



------------------
This commit was generated by Migit
2014-04-02 08:40:21 +02:00