Commit Graph

702 Commits

Author SHA1 Message Date
Jacek Jendrzej
2c5bf73006 Merge branch 'master' into pu/mp 2017-09-13 13:40:40 +02:00
Jacek Jendrzej
6576729fd1 remove double includes 2017-09-08 21:21:32 +02:00
Jacek Jendrzej
6be63f736c Merge branch 'master' into pu/mp 2017-08-23 13:10:49 +02:00
Jacek Jendrzej
ba600f0e5c some inits and never read var 2017-08-23 12:58:26 +02:00
Jacek Jendrzej
c99486520e some inits warnings 2017-08-21 14:42:24 +02:00
Jacek Jendrzej
a70f3cb025 Merge branch 'master' into pu/mp 2017-06-16 14:19:26 +02:00
TangoCash
5256a11e66 supplemental to 7031e99573 2017-06-15 21:09:28 +02:00
Thilo Graf
f0891cb76f neutrinoapi.cpp: fix possible broken build
error: ‘to_string’ was not declared...

to_string is handled inside helpers.h/cpp.
include of <system/helpers.h> is required here.
2017-06-15 20:56:08 +02:00
TangoCash
7031e99573 [RemoteTimers] add possibility to transfer all timers at once via webif
Use:
http://boxip/control/sendalltimers?ip=10.1.1.xxx&force=1
http://boxip/control/sendalltimers?name=record%20box&force=true

if parameter name is given, it has to be in timerlist as remote box.
if parameter ip and name is given, ip is used.
if parameter force is set, all checks are disabled, and the local timer
will be deleted even the transfer was not successful.
2017-06-15 16:34:19 +02:00
Stefan Seyfried
5307e62506 set threadnames to unique values
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-07 14:17:12 +02:00
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
5188f721c4 set useful thread names for all spawned threads 2017-02-12 22:55:36 +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
Stefan Seyfried
b9da7f01bf set useful thread names for all spawned threads 2017-02-12 15:17:32 +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
8b47699447 Merge remote-tracking branch 'tuxbox/master' 2017-02-11 11:18:45 +01:00
GetAway
a62d5b7c8e make the webtv directory configurable 2017-02-09 08:22:43 +01:00
Stefan Seyfried
a409047714 Merge remote-tracking branch 'tuxbox/master' 2017-01-22 22:59:39 +01:00
svenhoefer
6b084689b4 - move nhttdp-documentation to /doc-directory 2016-12-15 14:00:45 +01:00
svenhoefer
29847283ad - yWeb: move data from /src to /data 2016-12-15 14:00:45 +01:00
svenhoefer
fdca96f7db - yWeb: fix extentions-url to (still empty) gui-yweb repository 2016-12-15 11:37:57 +01:00
Stefan Seyfried
c6d7968381 Merge remote-tracking branch 'tuxbox/master' 2016-12-04 18:02:51 +01:00
Stefan Seyfried
045587f6ec make sure the private dvb headers are used on coolstream 2016-11-16 20:30:14 +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
svenhoefer
5804ed2d3a - yWeb: fix url to Y_Version.txt 2016-10-30 01:34:41 +02:00
svenhoefer
4b25ad6951 - yWeb: change info string to Tuxbox-Neutrino 2016-10-30 01:34:41 +02: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
svenhoefer
9976307997 - yWeb: internal rename path_usrbin -> path_varbin 2016-10-01 11:06:11 +02:00
svenhoefer
f3bed64765 - yWeb: intensive use of variables 2016-10-01 11:06:11 +02:00