Commit Graph

413 Commits

Author SHA1 Message Date
Jacek Jendrzej
b567c33f35 nhttpd: fix switch tv<>radio in standby mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a97efe317
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-04-02 (Thu, 02 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-02 21:05:51 +02:00
Jacek Jendrzej
1dcbbf603d nhttpd: change sprintf to snprintf
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f2ac568c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)

Origin message was:
------------------
nhttpd: change sprintf to snprintf

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

------------------
This commit was generated by Migit
2015-03-31 14:44:41 +02:00
Stefan Seyfried
499659677f Merge remote-tracking branch 'test/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-07 20:09:44 +01:00
vanhofen
021e941a5d yWeb: icons cleanup; big thanks to fred_feuerstein
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f5a8aebfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-02-26 (Thu, 26 Feb 2015)

Origin message was:
------------------
- yWeb: icons cleanup; big thanks to fred_feuerstein

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

------------------
This commit was generated by Migit
2015-02-26 00:19:04 +01:00
Stefan Seyfried
f5d3bb2d9f Merge remote-tracking branch 'check/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22dd798325
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-25 21:20:22 +01:00
Jacek Jendrzej
89c4d607d5 nhttpd: neutrinoapi.cpp disable unused func
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35c5faac67
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-24 18:05:52 +01:00
Stefan Seyfried
31c7317205 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)



------------------
This commit was generated by Migit
2015-02-07 23:12:01 +01:00
[CST] Focus
b492148034 eitd: as long as neutrino using only first content classification,
reduce content classification caching (leaving old code with ifdef)


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



------------------
This commit was generated by Migit
2015-01-30 19:47:30 +03:00
Jacek Jendrzej
e9483cd66e make channel_id private, use getChannelID()
Origin commit data
------------------
Branch: ni/coolstream
Commit: c624505818
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-29 (Thu, 29 Jan 2015)

Origin message was:
------------------
 make channel_id private, use getChannelID()

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

------------------
This commit was generated by Migit
2015-01-29 14:58:09 +01:00
Stefan Seyfried
190c9bb2a7 fix 64bit format string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: c41c7b3002
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-27 10:58:43 +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
Jacek Jendrzej
5afc24dc67 use empty to check string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b5e7b5ba3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-09 17:15:11 +01:00
Jacek Jendrzej
5288c70665 neutrino use check empty() instead of length() or size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-03 (Sat, 03 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-03 17:51:08 +01:00
Stefan Seyfried
f76a607799 add CFLAGS for libsigc
Origin commit data
------------------
Branch: ni/coolstream
Commit: a92eb8f8e7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-02 (Fri, 02 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-02 21:00:18 +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
f8f6c58bdc add CFLAGS for libsigc
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41dd237498
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:11:36 +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
Jacek Jendrzej
d3f0ce3dc5 nhttpd - fix select audio pid in live (vlc) mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: f236b4807b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-12-23 (Tue, 23 Dec 2014)


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

------------------
This commit was generated by Migit
2014-12-23 17:45:17 +01:00
vanhofen
526400e413 controlapi: fix horrible typo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 069defa31c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)

Origin message was:
------------------
- controlapi: fix horrible typo

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

------------------
This commit was generated by Migit
2014-12-06 09:36:29 +01:00
vanhofen
d10141dde1 controlapi: cleanup from unused esound rests
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ff65299d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)

Origin message was:
------------------
- controlapi: cleanup from unused esound rests

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

------------------
This commit was generated by Migit
2014-12-06 09:36:23 +01:00
Jacek Jendrzej
a945830c8b nhttpd controlapi: change for subchannel to subchannel zap
Origin commit data
------------------
Branch: ni/coolstream
Commit: c8f0c68cf6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-06 14:38:30 +01:00
Christian Schuett
5938d70f36 nhttpd controlapi: allow zapping to subchannels
based on idea by Moritz Venn <moritz.venn@freaque.net>

Signed-off-by: Christian Schuett <Gaucho316@hotmail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 59ca850ecc
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2014-11-02 (Sun, 02 Nov 2014)



------------------
This commit was generated by Migit
2014-11-05 09:20:02 +01:00
Jacek Jendrzej
12ced06e44 nhttpd:controlapi.cpp fix getallsubchannels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 847b08aedb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-05 (Wed, 05 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-05 09:20:02 +01:00
martii
070b342de4 overload access(2)
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp


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



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
Benny
364afbec33 add localization tag for time elapsed/remaining
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f16c9441e
Author: Benny <Benny@users.noreply.github.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-23 12:46:40 +02: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
martii
9e2ad55568 nttpd: allow sendfile() to cope with files >= 2GB; introduce range support
(This re-applies most of the patches I've reverted about two hours ago.)


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff46970457
Author: martii <m4rtii@gmx.de>
Date: 2014-07-20 (Sun, 20 Jul 2014)



------------------
This commit was generated by Migit
2014-08-26 17:31:57 +04:00
Jacek Jendrzej
56f7daa01a Revert "nhttpd: let sendfile() support files >= 2GB"
This reverts commit 9842afecad8dfb91dfd7221aedbeaf5379a89534.


Origin commit data
------------------
Branch: ni/coolstream
Commit: cf0bf3fa20
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-08-17 (Sun, 17 Aug 2014)



------------------
This commit was generated by Migit
2014-08-26 17:31:48 +04:00
martii
24f9a990b4 nhttpd: let sendfile() support files >= 2GB
Origin commit data
------------------
Branch: ni/coolstream
Commit: d71958ba8c
Author: martii <m4rtii@gmx.de>
Date: 2014-07-20 (Sun, 20 Jul 2014)


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

------------------
This commit was generated by Migit
2014-08-26 17:31:22 +04:00
vanhofen
e99fb152b2 neutrinoyparser: detect Zee²; fix Boxmodel for Trinity
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8322c9e408
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-27 (Fri, 27 Jun 2014)

Origin message was:
------------------
- neutrinoyparser: detect Zee²; fix Boxmodel for Trinity

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

------------------
This commit was generated by Migit
2014-06-27 10:41:01 +02: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
[CST] Focus
61bc54199f fix warnings if some want to use c++11
Origin commit data
------------------
Branch: ni/coolstream
Commit: c78676f7fd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-17 (Thu, 17 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-21 14:07:38 +04:00
vanhofen
a2176524d2 yWeb: scale channellogos in channellist and epg plus
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e2290a758
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-04-01 (Tue, 01 Apr 2014)

Origin message was:
------------------
- yWeb: scale channellogos in channellist and epg plus

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

------------------
This commit was generated by Migit
2014-04-01 17:59:04 +02:00
vanhofen
7cc9ca31e1 controlapi: add boxmodel to control/info?hwinfo
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3e8142fae
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-26 (Wed, 26 Mar 2014)

Origin message was:
------------------
- controlapi: add boxmodel to control/info?hwinfo

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

------------------
This commit was generated by Migit
2014-03-26 13:25:06 +01:00
vanhofen
224246aa56 neutrinoyparser: remove delivery_system from boxname
Origin commit data
------------------
Branch: ni/coolstream
Commit: d4dc3fcbbd
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-26 (Wed, 26 Mar 2014)

Origin message was:
------------------
- neutrinoyparser: remove delivery_system from boxname

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

------------------
This commit was generated by Migit
2014-03-26 13:25:06 +01:00
vanhofen
6a9ec9da39 neutrinoyparser: add function 'get_boxmodel'
Origin commit data
------------------
Branch: ni/coolstream
Commit: d81b50523c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-26 (Wed, 26 Mar 2014)

Origin message was:
------------------
- neutrinoyparser: add function 'get_boxmodel'

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

------------------
This commit was generated by Migit
2014-03-26 13:25:06 +01:00
Stefan Seyfried
59b887d87a Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
2014-02-15 20:22:07 +01:00
Jacek Jendrzej
6c41c1aa1d CControlAPI::EpgSearchXMLCGI convert channelname to xml
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e2e14e134
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-13 (Thu, 13 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-13 20:12:31 +01:00
Michael Liebmann
4abf2a80f8 yWeb: Synchronize volume/audiomute settings yWeb => GUI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fce346c0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-12 06:02:27 +01:00
vanhofen
c5f022fe75 CControlAPI: SignalInfoCGI: don't show description in explicit calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63d66538ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-10 (Mon, 10 Feb 2014)

Origin message was:
------------------
- CControlAPI: SignalInfoCGI: don't show description in explicit calls

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

------------------
This commit was generated by Migit
2014-02-10 21:50:34 +01:00
Jacek Jendrzej
b6e01fe87e CControlAPI:: -add SignalInfoCGI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d01e2152a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-10 (Mon, 10 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-10 21:14:54 +01:00
Stefan Seyfried
d235d78f43 Merge remote-tracking branch 'broken/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65437a60a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-28 (Tue, 28 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-28 13:22:00 +01:00
Jacek Jendrzej
8126ba13a5 webif standby -add option CEC standby off (dont use TV off)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9855a220be
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-28 10:30:29 +01:00
Stefan Seyfried
fe96831ba6 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9bc524562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-27 21:00:18 +01:00
Jacek Jendrzej
267405c5f7 supplement to e9643a6d05 cec option in standby off and on
Origin commit data
------------------
Branch: ni/coolstream
Commit: 372b367b8b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-27 20:26:46 +01:00
Jacek Jendrzej
e9643a6d05 add webif option dont use CEC with standbyoff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4be0273083
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-26 (Sun, 26 Jan 2014)

Origin message was:
------------------
-add webif option dont use CEC with standbyoff

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

------------------
This commit was generated by Migit
2014-01-26 22:24:17 +01:00
Stefan Seyfried
b7c804fc22 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Stefan Seyfried
19cb443dec Merge remote-tracking branch 'check/next-cc'
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: eca8f5459b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-19 (Sun, 19 Jan 2014)



------------------
This commit was generated by Migit
2014-01-19 13:37:24 +01:00
Jacek Jendrzej
8c80942d01 CControlAPI::EpgSearchCGI add duration to txt output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59b3245680
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-18 20:17:24 +01:00