Commit Graph

413 Commits

Author SHA1 Message Date
vanhofen
45f0ad7d7e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 23:39:43 +01:00
vanhofen
9713a31d6a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4cab22024f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 22:47:35 +01:00
vanhofen
4152afc612 neutrinoyparser: stay compatible with present code in Y_Blocks.txt
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60d3cfb962
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: stay compatible with present code in Y_Blocks.txt

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

------------------
This commit was generated by Migit
2017-03-13 23:48:08 +01:00
vanhofen
ca99393430 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


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



------------------
This commit was generated by Migit
2017-03-12 22:03:03 +01:00
vanhofen
774da40e92 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d384f4e37c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-10 15:37:03 +01:00
vanhofen
938e4c22f8 controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0203de264f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION

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

------------------
This commit was generated by Migit
2017-03-10 15:36:13 +01:00
vanhofen
07da62e157 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)



------------------
This commit was generated by Migit
2017-03-10 15:10:04 +01:00
vanhofen
734e15b5ff neutrinoyparser: use hw_caps in func_get_boxtype() ...
... and func_get_boxmodel()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 305b1a6da5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: use hw_caps in func_get_boxtype() ...

... and func_get_boxmodel()


------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
aa974ec7f8 controlapi: use hw_caps in HWInfoCGI()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b902648b08
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: use hw_caps in HWInfoCGI()

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

------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
bafdb8ba90 controlapi: /control/info => return right name
Origin commit data
------------------
Branch: ni/coolstream
Commit: e092059f32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return right name

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

------------------
This commit was generated by Migit
2017-03-10 15:07:52 +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
9bd8b2b10c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


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



------------------
This commit was generated by Migit
2017-03-01 13:09:50 +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
311ae84f54 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d05bd5d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)



------------------
This commit was generated by Migit
2017-02-23 12:23:43 +01:00
vanhofen
2b3a274678 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: de1be9b239
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-23 12:22:30 +01:00
vanhofen
cfa00da84e controlapi: fix perror message
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c2e25103f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- controlapi: fix perror message

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

------------------
This commit was generated by Migit
2017-02-22 15:25:04 +01:00
vanhofen
ff7b7dfde7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


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



------------------
This commit was generated by Migit
2017-02-12 23:04:09 +01:00
vanhofen
6e85f1b0ca Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-02-12 23:01:15 +01:00
Stefan Seyfried
fc5d95a4d0 remove unnecessary sectionsdclient.h includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: c14c15ea24
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-12 22:48:35 +01:00
vanhofen
afda007d95 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


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



------------------
This commit was generated by Migit
2017-02-12 22:17:17 +01:00
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
45d33bdf00 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-29 15:15:34 +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
30bd7aa4cc Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/zapit/src/femanager.cpp


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



------------------
This commit was generated by Migit
2016-11-13 01:34:20 +01:00
Stefan Seyfried
512e039fb6 neutrinoyparser: fix string literal warning with newer gcc
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc06052985
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-12 18:24:14 +01:00
Stefan Seyfried
d8d4d753a5 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c92d112d0
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-12 18:06:26 +01:00
vanhofen
390f589ac1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d4b9daf01e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-11 09:16:24 +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
8474ef8c98 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 13:08:01 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
ca5c4b00d7 Merge branch 'ni/cst-next' into ni/mp/cst-next
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


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



------------------
This commit was generated by Migit
2016-10-10 17:27:55 +02: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
bbe6981b2b Merge branch 'ni/cst-next' into ni/mp/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: b82573e85a
Author: vanhofen <vanhofen@gmx.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 15:01:13 +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
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


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



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
73da438ec4 Merge branch 'cst-next' into nmp-cst-next_test
Origin commit data
------------------
Branch: ni/coolstream
Commit: f162708f6a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
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:52:10 +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