Commit Graph

177 Commits

Author SHA1 Message Date
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
Jacek Jendrzej
acbb765586 CControlAPI:: epgsearchxml fix time format
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f65005339
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-16 18:46:51 +01:00
Jacek Jendrzej
9ac0106bd4 CControlAPI:: -add epgsearchxml & epgsearch
Origin commit data
------------------
Branch: ni/coolstream
Commit: f373f621ef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-14 (Tue, 14 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-14 19:15:46 +01:00
Stefan Seyfried
a5feafa1b5 timerd: rename TIMER_NEXTPROGRAM
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)


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



------------------
This commit was generated by Migit
2014-01-13 21:03:11 +01:00
Stefan Seyfried
26abd01822 timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.


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



------------------
This commit was generated by Migit
2014-01-13 20:57:40 +01:00
Stefan Seyfried
3845dff7be timerd: rename TIMER_NEXTPROGRAM
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)


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



------------------
This commit was generated by Migit
2014-01-12 16:56:41 +01:00
Stefan Seyfried
525fd6261b timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.


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



------------------
This commit was generated by Migit
2014-01-12 15:07:31 +01:00
Stefan Seyfried
0c4ecc191a Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-29 22:12:09 +01:00
martii
d1ed51a228 nhttpd/controlapi: add mode=all to GetBouquetCGI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b730409ed
Author: martii <m4rtii@gmx.de>
Date: 2013-12-26 (Thu, 26 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-26 13:35:01 +01:00
martii
6fa7c4f1d6 nhttpd/controlapi: GetBouquetsCGI: support "mode=all" (compiles, untested)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83534791ef
Author: martii <m4rtii@gmx.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-26 13:35:01 +01:00
Stefan Seyfried
464d5ab9b9 Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


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



------------------
This commit was generated by Migit
2013-12-25 22:51:23 +01:00
Jacek Jendrzej
8444bc6d2b CControlAPI::GetBouquetsCGI: -add TV/RADDIO mode selectable (THX martii)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0866bc65a7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-25 (Wed, 25 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-25 18:11:33 +01:00
Stefan Seyfried
2c48d93e05 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-07 (Sat, 07 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-07 18:28:56 +01:00
vanhofen
669c1fc9bf yWeb: use same order in search for channellogos as neutrino
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8f7668a9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-06 (Fri, 06 Dec 2013)

Origin message was:
------------------
- yWeb: use same order in search for channellogos as neutrino

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

------------------
This commit was generated by Migit
2013-12-06 13:30:52 +01:00
Stefan Seyfried
6a04931cb7 Makefiles: simplify includes for libcoolstream/libstb-hal
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a728f9ee1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-11 21:51:08 +01:00
Stefan Seyfried
b0077cafc5 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)



------------------
This commit was generated by Migit
2013-11-10 16:55:53 +01:00
Jacek Jendrzej
ced560668b CControlAPI::_GetBouquetActualEPGItem: -add eventid & timeTotal to secondEPG
Origin commit data
------------------
Branch: ni/coolstream
Commit: aaad29a245
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-05 15:42:50 +01:00
Stefan Seyfried
971d575b78 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
Michael Liebmann
ec6bf71c64 Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5091e920fc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-17 04:22:49 +02:00
Jacek Jendrzej
6323734197 CControlAPI::GetBouquetCGI fix segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 733f7a5382
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-12 (Sat, 12 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-12 22:01:17 +02:00
Jacek Jendrzej
345419d01f CControlAPI::EpgCGI fix control/epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 03b7151563
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-12 (Sat, 12 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-12 21:39:41 +02:00
[CST] Focus
3137c4497c neutrino: add EAC3 audio support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e6276def7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-08 17:18:35 +04:00
vanhofen
40101950e4 controlapi: use rcsim.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c2fbf3348
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-04 (Fri, 04 Oct 2013)

Origin message was:
------------------
- controlapi: use rcsim.h

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

------------------
This commit was generated by Migit
2013-10-04 12:00:28 +02:00
Jacek Jendrzej
68696c85af CControlAPI::SendChannelList: show only unique channellist & currenttpchannels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d7751dc8c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-01 17:55:18 +02:00
vanhofen
dc660e7e7f yweb: fix /control/reboot
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5227f726c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)

Origin message was:
------------------
- yweb: fix /control/reboot

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

------------------
This commit was generated by Migit
2013-09-28 22:25:41 +02:00
[CST] Focus
afca303c15 nhttpd/tuxboxapi/coolstream/controlapi.cpp: wakeup zapit before neutrino,
to be sure zapit will process any next commands


Origin commit data
------------------
Branch: ni/coolstream
Commit: d26bc23f6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-27 (Fri, 27 Sep 2013)



------------------
This commit was generated by Migit
2013-09-27 16:27:21 +04:00
[CST] Focus
aa8cce313d nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp: fix memleak in GetChannelEvents()
Origin commit data
------------------
Branch: ni/coolstream
Commit: a2d5ccdce2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-25 17:08:34 +04:00
Jacek Jendrzej
226972c34c CControlAPI::_GetBouquetWriteItem: -fix UTF-8 (THX Gaucho316) http://www.dbox2world.net/index.php?page=Thread&postID=157423
Origin commit data
------------------
Branch: ni/coolstream
Commit: c06e0c4bb4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-24 12:39:54 +02:00
vanhofen
b5aa6b36b8 yweb: remove delivery_system from boxtype tank
and avoid duplicate code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 99b477207f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-20 (Fri, 20 Sep 2013)

Origin message was:
------------------
- yweb: remove delivery_system from boxtype tank

 and avoid duplicate code


------------------
This commit was generated by Migit
2013-09-20 13:36:42 +02:00
[CST] Focus
4b08171904 nhttpd/tuxboxapi/coolstream/controlapi.cpp: call GetChannelEvents only if epg param present,
add 'fav' param to get only user bouquets;
add support to get bouquet's channel list with epg also in plain format


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2df40249d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)



------------------
This commit was generated by Migit
2013-09-03 18:23:20 +04:00
Stefan Seyfried
2dcc32acd2 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
vanhofen
81bb786c2f controlapi/yparser: detect new models tank and trinity
Origin commit data
------------------
Branch: ni/coolstream
Commit: efe212413b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-08-15 (Thu, 15 Aug 2013)

Origin message was:
------------------
- controlapi/yparser: detect new models tank and trinity

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

------------------
This commit was generated by Migit
2013-08-15 16:25:38 +02:00
vanhofen
c7d0ae03e4 yweb: add PCR PID handling to live streaming ...
... and add PCR PID and PMT PID to streaminfo

based on patches by Christian Schuett <Gaucho316@hotmail.com> in Tuxbox Git


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff161a699c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-08-09 (Fri, 09 Aug 2013)

Origin message was:
------------------
- yweb: add PCR PID handling to live streaming ...

... and add PCR PID and PMT PID to streaminfo

based on patches by Christian Schuett <Gaucho316@hotmail.com> in Tuxbox Git


------------------
This commit was generated by Migit
2013-08-09 11:04:26 +02:00
Stefan Seyfried
7e692549d3 Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
2013-07-06 19:01:15 +02:00
vanhofen
bbebbb9ac3 yweb: rework classifying slidertable in channellist for a smoother view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63173fd5e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-28 (Fri, 28 Jun 2013)

Origin message was:
------------------
- yweb: rework classifying slidertable in channellist for a smoother view

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

------------------
This commit was generated by Migit
2013-06-28 00:52:59 +02:00
Stefan Seyfried
4c3c21152b Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
2013-06-16 21:22:14 +02:00
vanhofen
b0f5491fb9 yweb: use more matching zee-remotecontrol for neo twin
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa0920d807
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)

Origin message was:
------------------
- yweb: use more matching zee-remotecontrol for neo twin

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

------------------
This commit was generated by Migit
2013-06-13 11:43:40 +02:00