435 Commits

Author	SHA1	Message	Date
svenhoefer	b12624d1fa	Merge branch 'master' into pu/mp ... Conflicts: src/gui/miscsettings_menu.cpp src/neutrino.cpp src/system/settings.h	2017-03-20 01:31:51 +01:00
svenhoefer	59adc88491	- neutrinoyparser: remove workaround for Neo Twin	2017-03-19 01:04:48 +01:00
svenhoefer	9e5c30f754	- controlapi: use "CST" instead of "Coolstream" ... ... because I don't know the current legal situation.	2017-03-19 01:04:48 +01:00
svenhoefer	f498775647	Merge branch 'master' into pu/mp	2017-03-14 08:06:05 +01:00
svenhoefer	60d3cfb962	- neutrinoyparser: stay compatible with present code in Y_Blocks.txt	2017-03-13 23:48:08 +01:00
svenhoefer	8bdb16cec6	Merge remote-tracking branch 'neutrino-mp/master' into pu/mp ... Conflicts: src/neutrino.cpp src/nhttpd/tuxboxapi/neutrinoyparser.cpp	2017-03-13 16:14:33 +01:00
svenhoefer	0203de264f	- controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION	2017-03-10 15:36:13 +01:00
svenhoefer	305b1a6da5	- neutrinoyparser: use hw_caps in func_get_boxtype() ... ... ... and func_get_boxmodel()	2017-03-10 15:07:52 +01:00
svenhoefer	b902648b08	- controlapi: use hw_caps in HWInfoCGI()	2017-03-10 15:07:52 +01:00
svenhoefer	e092059f32	- controlapi: /control/info => return right name	2017-03-10 15:07:52 +01:00
Stefan Seyfried	abec1c311b	Merge remote-tracking branch 'tuxbox/master'	2017-03-04 19:32:30 +01:00
svenhoefer	856c676430	- rename g_PluginList to g_Plugins; this isn't a list of plugins	2017-03-01 13:03:50 +01:00
Stefan Seyfried	4aab7d37f5	Merge branch 'tuxbox-fixed'	2017-02-22 20:06:27 +01:00
svenhoefer	7c2e25103f	- controlapi: fix perror message	2017-02-22 15:25:04 +01:00
Stefan Seyfried	c14c15ea24	remove unnecessary sectionsdclient.h includes	2017-02-12 22:48:35 +01:00
Stefan Seyfried	2819e651c3	Merge remote-tracking branch 'tuxbox/pu/fb-modules' ... only compile tested ;-)	2017-02-12 21:29:10 +01:00
M. Liebmann	0d66899cbd	neutrino: Rename hardware defined macros for coolstream stb ... BOXMODEL_NEVIS => BOXMODEL_CS_HD1 BOXMODEL_APOLLO => BOXMODEL_CS_HD2	2017-02-12 09:21:04 +01:00
Stefan Seyfried	4226ba01d2	remove unnecessary sectionsdclient.h includes	2017-02-11 14:42:15 +01:00
Stefan Seyfried	ee5f73c64d	neutrinoyparser: fix string literal warning with newer gcc	2016-11-13 01:43:37 +01:00
Stefan Seyfried	bc06052985	neutrinoyparser: fix string literal warning with newer gcc	2016-11-12 18:24:14 +01:00
Stefan Seyfried	2c92d112d0	Merge remote-tracking branch 'tuxbox/master'	2016-11-12 18:06:26 +01:00
svenhoefer	703caef3f6	- controlapi: fix compiler warning ... error: declaration of 'channel_id' shadows a previous local	2016-11-09 17:13:43 +01:00
svenhoefer	3150d9edac	- controlapi: add epg_id to several outputs; add /control/getepgid ... * /control/getepgid[?format=plain|json|xml]	2016-11-09 11:55:44 +01:00
Stefan Seyfried	13ab1ebc8a	Merge remote-tracking branch 'tuxbox/master' ... * needs compile fixes * needs additional tests, of course :-)	2016-10-22 11:37:40 +02:00
svenhoefer	104d21e784	- rename customcolor.h -> color_custom.h; reduce unneeded inludes	2016-10-10 14:19:55 +02:00
M. Liebmann	312a80bee9	Set correct path for /.version if TARGET_PREFIX is in use.	2016-10-01 11:47:59 +02:00
TangoCash	3f32350645	add autoAdjustToEPG to webif API	2016-09-26 13:04:48 +02:00
vanhofen	3e283469db	- tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile()	2016-08-26 16:05:45 +02:00
vanhofen	7ac0ed9093	- 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().	2016-08-26 16:05:45 +02:00
TangoCash	3f3ff32c86	fix xmltv channellogos	2016-08-26 16:05:45 +02:00
martii	b66c1e9f0f	nhttpd/neutrinoapi: fix getLogoFile()	2016-08-26 16:05:45 +02:00
svenhoefer	7c47b1a2a6	- controlapi: remove unused variable outType from xmltv functions	2016-08-23 15:39:09 +02:00
TangoCash	bdde716c4a	- controlapi: add xmltv support	2016-08-23 14:26:24 +02:00
Jacek Jendrzej	d139c1c8dd	nhttpd remove unused	2016-05-11 13:01:08 +02:00
Jacek Jendrzej	52f4312aef	nhttpd use epg id to get events	2016-05-11 12:52:11 +02:00
svenhoefer	f764fe6c54	- 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	2016-04-20 08:26:40 +02:00
svenhoefer	5e6720a849	- neutrinoyparser: fix Trinity detection	2016-04-19 13:24:12 +02:00
svenhoefer	feae5aef97	- neutrinoyparser: add Link and Trinity Duo	2016-04-19 13:10:48 +02:00
Jacek Jendrzej	136955157d	nhttpd: unused var and function	2016-03-19 16:13:56 +01:00
svenhoefer	c5f3531913	- controlapi: use hh->SendResult() in new getMoviesCGI()	2016-03-19 13:52:07 +01:00
svenhoefer	2fd4d6c4a1	- controlapi: whitespace cleanup; remove dup getSubdirectories()	2016-03-19 13:52:07 +01:00
Ezak	f323f61785	add getmovies control	2016-03-19 13:52:07 +01:00
Ezak	5ac755f75c	remove unused vars in controlapi	2016-03-19 13:52:07 +01:00
svenhoefer	129dacc912	- yWeb/neutrinoyparser: add icons for scrabled and webtv channels	2016-03-14 21:55:45 +01:00
svenhoefer	5f613b0b30	- yWeb: add link to get stream to channellist; thx to dasda	2016-03-14 18:14:00 +01:00
svenhoefer	4fd9c12aa9	- neutrinoyparser: smoother view in channellist; align icons right	2016-03-14 18:14:00 +01:00
Jacek Jendrzej	0f2c2c7631	src/nhttpd/tuxboxapi/ fix AddressSanitizer: strcpy-param-overlap: memory ranges	2016-03-12 18:55:53 +01:00
[CST] Focus	14a73c3b80	nhttpd: try to fix threaded nhttp crashes (again)	2016-03-08 18:05:34 +03:00
svenhoefer	9b64861912	- partly revert e855ceef8e5a3719be4252aa5c5ef4be561d72d5; ... ... ... "copy event to prevent crash in multi-threaded mode"	2016-03-07 20:11:57 +01:00
Jacek Jendrzej	9fc9b228ed	src/nhttpd/tuxboxapi/controlapi.cpp fix 64bit AddressSanitizer: heap-buffer-overflow	2016-03-03 20:49:58 +01:00