mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 22:58:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,175 Commits 2 Branches 9 Tags
fa71a4316826ea70d1fc635ce32399eb4b644173
Commit Graph

146 Commits

Author SHA1 Message Date
vanhofen
2e8117384c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d4b9daf01e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 09:16:24 +01:00
vanhofen
39c9b659c6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: f8deee994d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-09 17:16:25 +01:00
vanhofen
782052704c controlapi: fix compiler warning 
error: declaration of 'channel_id' shadows a previous local


Origin commit data
------------------
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
 2016-11-09 17:13:43 +01:00
vanhofen
a7a8acc8b0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ca4bfdf36b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-09 12:35:39 +01:00
vanhofen
9bbf604d96 controlapi: add epg_id to several outputs; add /control/getepgid 
* /control/getepgid[?format=plain|json|xml]


Origin commit data
------------------
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]
 2016-11-09 11:55:44 +01:00
vanhofen
7220c6b265 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
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 17:27:55 +02:00
vanhofen
b76e14080e 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
------------------
Commit: 6d6873b047
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)
 2016-10-01 11:54:51 +02:00
Michael Liebmann
65c4cfec97 Set correct path for /.version if TARGET_PREFIX is in use. 
Origin commit data
------------------
Commit: 312a80bee9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-25 (Sun, 25 Sep 2016)
 2016-10-01 11:47:59 +02:00
vanhofen
0a09791137 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Origin commit data
------------------
Commit: b82573e85a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 15:01:13 +02:00
vanhofen
510e620871 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
------------------
Commit: ff7fb885c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 14:28:47 +02:00
TangoCash
05e98f85b9 add autoAdjustToEPG to webif API 
Origin commit data
------------------
Commit: 3f32350645
Author: TangoCash <eric@loxat.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 13:04:48 +02:00
vanhofen
bc33663742 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
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
6e38f7b956 Merge branch 'cst-next' into nmp-cst-next_test 
Origin commit data
------------------
Commit: f162708f6a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 16:52:10 +02:00
vanhofen
01add923d6 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 29009126df
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 16:06:36 +02:00
vanhofen
5223eb01dc tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile() 
Origin commit data
------------------
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()
 2016-08-26 16:05:45 +02:00
TangoCash
796c4bf5ea fix xmltv channellogos 
Origin commit data
------------------
Commit: 3f3ff32c86
Author: TangoCash <eric@loxat.de>
Date: 2016-08-25 (Thu, 25 Aug 2016)
 2016-08-26 16:05:45 +02:00
Michael Liebmann
9d30a0906d Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: f5ad46c5d9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-24 (Wed, 24 Aug 2016)
 2016-08-24 09:54:34 +02:00
vanhofen
934cf9dd44 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: c2e4b979bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)
 2016-08-23 15:40:06 +02:00
vanhofen
6398975e24 controlapi: remove unused variable outType from xmltv functions 
Origin commit data
------------------
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
 2016-08-23 15:39:09 +02:00
vanhofen
c0e2dff77f Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 44851658cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)
 2016-08-23 14:31:41 +02:00
TangoCash
2891e335b1 controlapi: add xmltv support 
Origin commit data
------------------
Commit: bdde716c4a
Author: TangoCash <eric@loxat.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)

Origin message was:
------------------
- controlapi: add xmltv support
 2016-08-23 14:26:24 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Jacek Jendrzej
11ff271a19 nhttpd use epg id to get events 
Origin commit data
------------------
Commit: 52f4312aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-11 (Wed, 11 May 2016)
 2016-05-11 12:52:11 +02:00
Jacek Jendrzej
0625fcb709 nhttpd: unused var and function 
Origin commit data
------------------
Commit: 136955157d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
nhttpd: unused var and function
 2016-03-19 16:13:56 +01:00
vanhofen
6f5e577c2c controlapi: use hh->SendResult() in new getMoviesCGI() 
Origin commit data
------------------
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()
 2016-03-19 13:52:07 +01:00
vanhofen
dba4d0efc5 controlapi: whitespace cleanup; remove dup getSubdirectories() 
Origin commit data
------------------
Commit: 2fd4d6c4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
- controlapi: whitespace cleanup; remove dup getSubdirectories()
 2016-03-19 13:52:07 +01:00
Marc Szymkowiak
73f6e9df2a add getmovies control 
Origin commit data
------------------
Commit: f323f61785
Author: Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
Date: 2016-02-19 (Fri, 19 Feb 2016)
 2016-03-19 13:52:07 +01:00
Marc Szymkowiak
07ee447e97 remove unused vars in controlapi 
Origin commit data
------------------
Commit: 5ac755f75c
Author: Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
Date: 2016-02-19 (Fri, 19 Feb 2016)
 2016-03-19 13:52:07 +01:00
Jacek Jendrzej
964e9042cb src/nhttpd/tuxboxapi/ fix AddressSanitizer: strcpy-param-overlap: memory ranges 
Origin commit data
------------------
Commit: 0f2c2c7631
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)
 2016-03-12 18:55:53 +01:00
[CST] Focus
86c6632755 nhttpd: try to fix threaded nhttp crashes (again) 
Origin commit data
------------------
Commit: 14a73c3b80
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
 2016-03-08 18:05:34 +03:00
vanhofen
b900b262fd partly revert af4c52f488922910431010030b08dde65de7e3ad; ... 
... "copy event to prevent crash in multi-threaded mode"


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

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

... "copy event to prevent crash in multi-threaded mode"
 2016-03-07 20:11:57 +01:00
Jacek Jendrzej
5b3b2b19c1 src/nhttpd/tuxboxapi/controlapi.cpp fix 64bit AddressSanitizer: heap-buffer-overflow 
Origin commit data
------------------
Commit: 9fc9b228ed
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)
 2016-03-03 20:49:58 +01:00
[CST] Focus
c4a07ea711 nhttpd/tuxboxapi/controlapi.cpp: add direct record start for current channel 
Origin commit data
------------------
Commit: fc11a76c01
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-02 (Wed, 02 Mar 2016)
 2016-03-02 14:30:51 +03:00
vanhofen
8c7d6db807 controlapi/getmode: allow to get channelsmode in all stb modes 
Origin commit data
------------------
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
 2016-03-01 10:01:35 +01:00
vanhofen
c3dc083199 controlapi/epg: resort order of items; last order brakes plugins 
Origin commit data
------------------
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
 2016-02-27 00:03:34 +01:00
vanhofen
d6fde778d8 controlapi/timer: fix json output 
Origin commit data
------------------
Commit: 63333053f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-26 (Fri, 26 Feb 2016)

Origin message was:
------------------
- controlapi/timer: fix json output
 2016-02-26 09:03:24 +01:00
vanhofen
02abb61969 controlapi/timer: allow json output 
Origin commit data
------------------
Commit: 9615f547d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-25 (Thu, 25 Feb 2016)

Origin message was:
------------------
- controlapi/timer: allow json output
 2016-02-25 15:35:27 +01:00
Jacek Jendrzej
987757d215 fix AddressSanitizer: strncpy-param-overlap: memory ranges 
Origin commit data
------------------
Commit: d96f15fb6c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
 2016-02-24 18:46:12 +01:00
vanhofen
64fdadc288 controlapi/epgsearch: fix display of eventid 
Origin commit data
------------------
Commit: c6207d1cff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/epgsearch: fix display of eventid
 2016-02-24 16:45:52 +01:00
vanhofen
76497b73ff 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
------------------
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.
 2016-02-24 16:45:52 +01:00
vanhofen
6731f49fd2 controlapi/getchannel: fix possible crash when channel = NULL 
Origin commit data
------------------
Commit: 72cec30e97
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/getchannel: fix possible crash when channel = NULL
 2016-02-24 16:45:52 +01:00
vanhofen
ce972b16b8 controlapi: add small documentations for new stuff 
Origin commit data
------------------
Commit: 2d209a90d7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi: add small documentations for new stuff
 2016-02-24 14:38:25 +01:00
vanhofen
0a43f3f9a1 controlapi: add epginfo=false switch to epg output 
Origin commit data
------------------
Commit: 3a94e620c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi: add epginfo=false switch to epg output
 2016-02-24 13:52:23 +01:00
vanhofen
af4c52f488 controlapi: add /getchannel function to get infos about current channel. 
- controlapi: copy event to prevent crash in multi-threaded mode


Origin commit data
------------------
Commit: e855ceef8e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi: add /getchannel function to get infos about current channel.

- controlapi: copy event to prevent crash in multi-threaded mode
 2016-02-24 13:49:19 +01:00
vanhofen
5a00327ca2 controlapi: add /getchannelid function to get full id too 
Origin commit data
------------------
Commit: 3ceaae4efb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi: add /getchannelid function to get full id too
 2016-02-24 13:43:35 +01:00
vanhofen
5286a99f23 controlapi/logolist: use well-known tags for channelid's 
Origin commit data
------------------
Commit: f7fefac508
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/logolist: use well-known tags for channelid's
 2016-02-24 13:43:26 +01:00
vanhofen
b1fa8daf5e yhook: rename outCollection() => outObject() to be more json 
Origin commit data
------------------
Commit: 69615480f1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-23 (Tue, 23 Feb 2016)

Origin message was:
------------------
- yhook: rename outCollection() => outObject() to be more json
 2016-02-23 14:56:52 +01:00
vanhofen
d608e92880 control/logolist: allow json/xml output 
Origin commit data
------------------
Commit: 43bab4b534
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-23 (Tue, 23 Feb 2016)

Origin message was:
------------------
- control/logolist: allow json/xml output
 2016-02-23 14:42:28 +01:00
vanhofen
4089d66866 control/epgsearch: use outSingle instead of direct WriteLn 
Origin commit data
------------------
Commit: 3fd3f2ba1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-22 (Mon, 22 Feb 2016)

Origin message was:
------------------
- control/epgsearch: use outSingle instead of direct WriteLn
 2016-02-22 23:56:08 +01:00