Commit Graph

276 Commits

Author SHA1 Message Date
vanhofen
4ac4e963ad Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:54:48 +01:00
Michael Liebmann
3664527019 neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


------------------
This commit was generated by Migit
2017-02-12 09:21:04 +01:00
vanhofen
f17d069aae controlapi: add possibility to check for updates
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4183335244
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-24 (Sat, 24 Dec 2016)

Origin message was:
------------------
- controlapi: add possibility to check for updates

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

------------------
This commit was generated by Migit
2016-12-24 00:28:07 +01:00
vanhofen
531b7b2cc0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-13 01:48:39 +01:00
Stefan Seyfried
b61bc1aa90 neutrinoyparser: fix string literal warning with newer gcc
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee5f73c64d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-13 01:43:37 +01:00
vanhofen
30a241a40b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8deee994d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-09 17:16:25 +01:00
vanhofen
7ee31ecf63 controlapi: fix compiler warning
error: declaration of 'channel_id' shadows a previous local


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

Origin message was:
------------------
- controlapi: fix compiler warning

error: declaration of 'channel_id' shadows a previous local


------------------
This commit was generated by Migit
2016-11-09 17:13:43 +01:00
vanhofen
86bd9623ee Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca4bfdf36b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-09 12:35:39 +01:00
vanhofen
efad07c007 controlapi: add epg_id to several outputs; add /control/getepgid
* /control/getepgid[?format=plain|json|xml]


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

Origin message was:
------------------
- controlapi: add epg_id to several outputs; add /control/getepgid

* /control/getepgid[?format=plain|json|xml]


------------------
This commit was generated by Migit
2016-11-09 11:55:44 +01:00
vanhofen
3739b4de04 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 16:45:30 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
f6374e85e8 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/nhttpd/web/Makefile.am
	src/nhttpd/web/Y_Blocks.txt
	src/nhttpd/web/Y_Menue.yhtm
	src/nhttpd/web/Y_Settings_yWeb.yhtm


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d6873b047
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)



------------------
This commit was generated by Migit
2016-10-01 11:54:51 +02:00
Michael Liebmann
ee6fe6049f Set correct path for /.version if TARGET_PREFIX is in use.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 312a80bee9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-25 (Sun, 25 Sep 2016)


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

------------------
This commit was generated by Migit
2016-10-01 11:47:59 +02:00
vanhofen
60acefbf83 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	lib/timerdclient/timerdclient.cpp
	lib/timerdclient/timerdclient.h
	lib/timerdclient/timerdtypes.h
	src/gui/followscreenings.cpp
	src/timerd/timerd.cpp
	src/timerd/timermanager.cpp
	src/timerd/timermanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff7fb885c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)



------------------
This commit was generated by Migit
2016-09-26 14:28:47 +02:00
TangoCash
9dbfed21fa add autoAdjustToEPG to webif API
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f32350645
Author: TangoCash <eric@loxat.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-26 13:04:48 +02:00
vanhofen
8f2cbeb841 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29009126df
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-26 16:06:36 +02:00
vanhofen
3f71bf4b1f tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e283469db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile()

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

------------------
This commit was generated by Migit
2016-08-26 16:05:45 +02:00
vanhofen
27da45f59e neutrinoyparser: move search for channellogos to neutrinoyparser
This is to respecting user's setting to use other channellogos for
WebIf. Now WebIf tries Tuxbox.LogosURL from nhttpd.conf first.

Controlapi ignores these setting and providing the default system
channelogos using NeutrinoAPI->getLogoFile().


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ac0ed9093
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- neutrinoyparser: move search for channellogos to neutrinoyparser

This is to respecting user's setting to use other channellogos for
WebIf. Now WebIf tries Tuxbox.LogosURL from nhttpd.conf first.

Controlapi ignores these setting and providing the default system
channelogos using NeutrinoAPI->getLogoFile().


------------------
This commit was generated by Migit
2016-08-26 16:05:45 +02:00
TangoCash
58a479dc92 fix xmltv channellogos
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f3ff32c86
Author: TangoCash <eric@loxat.de>
Date: 2016-08-25 (Thu, 25 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-26 16:05:45 +02:00
martii
cb4b093b11 nhttpd/neutrinoapi: fix getLogoFile()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b66c1e9f0f
Author: martii <m4rtii@gmx.de>
Date: 2014-03-11 (Tue, 11 Mar 2014)


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

------------------
This commit was generated by Migit
2016-08-26 16:05:45 +02:00
vanhofen
f4009864bf Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: c2e4b979bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-23 15:40:06 +02:00
vanhofen
5490f62ef3 controlapi: remove unused variable outType from xmltv functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c47b1a2a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)

Origin message was:
------------------
- controlapi: remove unused variable outType from xmltv functions

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

------------------
This commit was generated by Migit
2016-08-23 15:39:09 +02:00
vanhofen
a0aa276626 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44851658cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-23 14:31:41 +02:00
TangoCash
518c0f534c controlapi: add xmltv support
Origin commit data
------------------
Branch: ni/coolstream
Commit: bdde716c4a
Author: TangoCash <eric@loxat.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)

Origin message was:
------------------
- controlapi: add xmltv support

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

------------------
This commit was generated by Migit
2016-08-23 14:26:24 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
a1714059ff nhttpd remove unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: d139c1c8dd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-11 (Wed, 11 May 2016)


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

------------------
This commit was generated by Migit
2016-05-11 13:01:08 +02:00
Jacek Jendrzej
8525df611a nhttpd use epg id to get events
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52f4312aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-11 (Wed, 11 May 2016)


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

------------------
This commit was generated by Migit
2016-05-11 12:52:11 +02:00
vanhofen
6fa4c10ac6 neutrinoyparser: try to fix nevis build
Todo: BOXMODEL_NEVIS should be renamed to HAVE_COOLSTREAM_HD1
 BOXMODEL_APOLLO should be renamed to HAVE_COOLSTREAM_HD2


Origin commit data
------------------
Branch: ni/coolstream
Commit: f764fe6c54
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-04-20 (Wed, 20 Apr 2016)

Origin message was:
------------------
- neutrinoyparser: try to fix nevis build

Todo: BOXMODEL_NEVIS should be renamed to HAVE_COOLSTREAM_HD1
   BOXMODEL_APOLLO should be renamed to HAVE_COOLSTREAM_HD2


------------------
This commit was generated by Migit
2016-04-20 08:26:40 +02:00
vanhofen
3865aaab1c neutrinoyparser: fix Trinity detection
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e6720a849
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-04-19 (Tue, 19 Apr 2016)

Origin message was:
------------------
- neutrinoyparser: fix Trinity detection

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

------------------
This commit was generated by Migit
2016-04-19 13:24:12 +02:00
vanhofen
360a50cc64 neutrinoyparser: add Link and Trinity Duo
Origin commit data
------------------
Branch: ni/coolstream
Commit: feae5aef97
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-04-19 (Tue, 19 Apr 2016)

Origin message was:
------------------
- neutrinoyparser: add Link and Trinity Duo

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

------------------
This commit was generated by Migit
2016-04-19 13:10:48 +02:00
Jacek Jendrzej
bf98b30b00 nhttpd: unused var and function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 136955157d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
nhttpd: unused var and function

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

------------------
This commit was generated by Migit
2016-03-19 16:13:56 +01:00
vanhofen
209529ff95 controlapi: use hh->SendResult() in new getMoviesCGI()
Origin commit data
------------------
Branch: ni/coolstream
Commit: c5f3531913
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
- controlapi: use hh->SendResult() in new getMoviesCGI()

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

------------------
This commit was generated by Migit
2016-03-19 13:52:07 +01:00
vanhofen
83eaedbabe controlapi: whitespace cleanup; remove dup getSubdirectories()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2fd4d6c4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
- controlapi: whitespace cleanup; remove dup getSubdirectories()

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

------------------
This commit was generated by Migit
2016-03-19 13:52:07 +01:00
Ezak
ce666d4a81 add getmovies control
Origin commit data
------------------
Branch: ni/coolstream
Commit: f323f61785
Author: Ezak <marc.szymkowiak91@googlemail.com>
Date: 2016-02-19 (Fri, 19 Feb 2016)


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

------------------
This commit was generated by Migit
2016-03-19 13:52:07 +01:00
Ezak
e728c98c69 remove unused vars in controlapi
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ac755f75c
Author: Ezak <marc.szymkowiak91@googlemail.com>
Date: 2016-02-19 (Fri, 19 Feb 2016)


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

------------------
This commit was generated by Migit
2016-03-19 13:52:07 +01:00
vanhofen
d3fe2960f6 yWeb/neutrinoyparser: add icons for scrabled and webtv channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 129dacc912
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-14 (Mon, 14 Mar 2016)

Origin message was:
------------------
- yWeb/neutrinoyparser: add icons for scrabled and webtv channels

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

------------------
This commit was generated by Migit
2016-03-14 21:55:45 +01:00
vanhofen
0ce9bcd791 yWeb: add link to get stream to channellist; thx to dasda
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f613b0b30
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-14 (Mon, 14 Mar 2016)

Origin message was:
------------------
- yWeb: add link to get stream to channellist; thx to dasda

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

------------------
This commit was generated by Migit
2016-03-14 18:14:00 +01:00
vanhofen
01fb340a01 neutrinoyparser: smoother view in channellist; align icons right
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fd9c12aa9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-14 (Mon, 14 Mar 2016)

Origin message was:
------------------
- neutrinoyparser: smoother view in channellist; align icons right

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

------------------
This commit was generated by Migit
2016-03-14 18:14:00 +01:00
Jacek Jendrzej
8d394d26cb src/nhttpd/tuxboxapi/ fix AddressSanitizer: strcpy-param-overlap: memory ranges
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f2c2c7631
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-12 18:55:53 +01:00
[CST] Focus
a5be5f3911 nhttpd: try to fix threaded nhttp crashes (again)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14a73c3b80
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-08 18:05:34 +03:00
vanhofen
5f61df8be2 partly revert eda0c8dc4aec00181cc09f7769f5876b69422fda; ...
... "copy event to prevent crash in multi-threaded mode"


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b64861912
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-06 (Sun, 06 Mar 2016)

Origin message was:
------------------
- partly revert eda0c8dc4aec00181cc09f7769f5876b69422fda; ...

... "copy event to prevent crash in multi-threaded mode"


------------------
This commit was generated by Migit
2016-03-07 20:11:57 +01:00
Jacek Jendrzej
0d7818f01d src/nhttpd/tuxboxapi/controlapi.cpp fix 64bit AddressSanitizer: heap-buffer-overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fc9b228ed
Author: Jacek Jendrzej <overx300@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 20:49:58 +01:00
[CST] Focus
70ea917953 nhttpd/tuxboxapi/controlapi.cpp: add direct record start for current channel
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc11a76c01
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-02 (Wed, 02 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-02 14:30:51 +03:00
vanhofen
d46725b9cc controlapi/getmode: allow to get channelsmode in all stb modes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a38042071
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-01 (Tue, 01 Mar 2016)

Origin message was:
------------------
- controlapi/getmode: allow to get channelsmode in all stb modes

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

------------------
This commit was generated by Migit
2016-03-01 10:01:35 +01:00
vanhofen
096952212b controlapi/epg: resort order of items; last order brakes plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: dcec44b8d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-27 (Sat, 27 Feb 2016)

Origin message was:
------------------
- controlapi/epg: resort order of items; last order brakes plugins

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

------------------
This commit was generated by Migit
2016-02-27 00:03:34 +01:00
vanhofen
1891cb0dcd controlapi/timer: fix json output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63333053f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-26 (Fri, 26 Feb 2016)

Origin message was:
------------------
- controlapi/timer: fix json output

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

------------------
This commit was generated by Migit
2016-02-26 09:03:24 +01:00
vanhofen
ab706cfa38 controlapi/timer: allow json output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9615f547d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-25 (Thu, 25 Feb 2016)

Origin message was:
------------------
- controlapi/timer: allow json output

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

------------------
This commit was generated by Migit
2016-02-25 15:35:27 +01:00
Jacek Jendrzej
6cee2ec1cd fix AddressSanitizer: strncpy-param-overlap: memory ranges
Origin commit data
------------------
Branch: ni/coolstream
Commit: d96f15fb6c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-24 18:46:12 +01:00
vanhofen
7246bc9969 controlapi/epgsearch: fix display of eventid
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6207d1cff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/epgsearch: fix display of eventid

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

------------------
This commit was generated by Migit
2016-02-24 16:45:52 +01:00
vanhofen
72ca399341 controlapi/epg: add fallback when no channel or bouquet is given
This function needs a fix, because "bouquetnr=all" breakes json output.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 911f333a7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/epg: add fallback when no channel or bouquet is given

This function needs a fix, because "bouquetnr=all" breakes json output.


------------------
This commit was generated by Migit
2016-02-24 16:45:52 +01:00