mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-06 13:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,209 Commits 2 Branches 9 Tags
9ef16b926bc25862825502de8532d6314ccb64c4
Commit Graph

133 Commits

Author SHA1 Message Date
Jacek Jendrzej
9ef16b926b add revert translate to webif rc 
Origin commit data
------------------
Commit: f336d4b471
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-01-22 (Mon, 22 Jan 2018)
 2018-01-22 23:17:34 +01:00
Jacek Jendrzej
65981a8492 try to fix rc over webif on hd51 
Origin commit data
------------------
Commit: a21fb645ac
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-01-22 (Mon, 22 Jan 2018)
 2018-01-22 23:17:34 +01:00
vanhofen
3990a3e4e7 controlapi: fix control of external plugins (e.g. msgbox or shellexec) 
We have to send the keys directyl to rc-device instead of using g_RCInput->postMsg()


Origin commit data
------------------
Commit: 06a6608413
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-19 (Fri, 19 Jan 2018)

Origin message was:
------------------
- controlapi: fix control of external plugins (e.g. msgbox or shellexec)

We have to send the keys directyl to rc-device instead of using g_RCInput->postMsg()
 2018-01-19 10:24:02 +01:00
vanhofen
dc27f0567c infoicons: avoid extern CInfoIcons; use getInstance() instead of this 
Origin commit data
------------------
Commit: 5a34b06137
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- infoicons: avoid extern CInfoIcons; use getInstance() instead of this
 2018-01-03 10:49:50 +01:00
vanhofen
4f2ee07da4 controlapi: fix typo in 016c5f8a23 
Origin commit data
------------------
Commit: 069774f84c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)

Origin message was:
------------------
- controlapi: fix typo in 016c5f8a23
 2017-11-23 17:23:01 +01:00
vanhofen
016c5f8a23 controlapi: add mode_webradio to GetModeCGI() 
Origin commit data
------------------
Commit: 110588d39b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- controlapi: add mode_webradio to GetModeCGI()
 2017-11-20 15:19:06 +01:00
vanhofen
8729b26638 neutrino: unify modes handling; ... 
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes
 2017-11-20 15:19:06 +01:00
vanhofen
c2cc8c434f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:21:37 +02:00
vanhofen
583f45fad7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:19:49 +02:00
Stefan Seyfried
c9d4fdd9cc remove "using namespace std" from header files 
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-02 13:43:57 +02:00
vanhofen
5c12837f35 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 21:53:44 +02:00
gixxpunk
abee9b0913 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 16:31:55 +02:00
Jacek Jendrzej
14145554aa fix mem leak 
Origin commit data
------------------
Commit: a7942c9987
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 08:56:02 +02:00
vanhofen
f37efba8f7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:44:18 +02:00
vanhofen
2ee7a428d9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:43:52 +02:00
Jacek Jendrzej
b03ab5cb9e remove double includes 
Origin commit data
------------------
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)
 2017-09-08 21:21:32 +02:00
vanhofen
61d41d0862 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/widget/listbox.cpp


Origin commit data
------------------
Commit: e32d5a869f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)
 2017-06-16 15:10:34 +02:00
vanhofen
ec01f046aa Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: b87ad3b5ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 17:32:05 +02:00
gixxpunk
24b0cc251b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 62498909da
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 16:46:45 +02:00
TangoCash
20c1a160bc [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.


Origin commit data
------------------
Commit: 7031e99573
Author: TangoCash <eric@loxat.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 16:34:19 +02:00
vanhofen
d9fc0a4a98 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:07:17 +01:00
vanhofen
20722a62cb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8a75efa81a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:05:31 +01:00
vanhofen
11240de06d controlapi: use "CST" instead of "Coolstream" ... 
because I don't know the current legal situation.


Origin commit data
------------------
Commit: 9e5c30f754
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- controlapi: use "CST" instead of "Coolstream" ...

because I don't know the current legal situation.
 2017-03-19 01:04:48 +01:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 22:03:03 +01:00
vanhofen
1cb8859aa9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d384f4e37c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:37:03 +01:00
vanhofen
4110492797 controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION 
Origin commit data
------------------
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
 2017-03-10 15:36:13 +01:00
vanhofen
a8db520beb 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
------------------
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:10:04 +01:00
vanhofen
26584b4308 controlapi: use hw_caps in HWInfoCGI() 
Origin commit data
------------------
Commit: b902648b08
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: use hw_caps in HWInfoCGI()
 2017-03-10 15:07:52 +01:00
vanhofen
7afeaefba4 controlapi: /control/info => return right name 
Origin commit data
------------------
Commit: e092059f32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return right name
 2017-03-10 15:07:52 +01:00
vanhofen
a360c99a70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:10:36 +01:00
vanhofen
260127f781 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
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:09:50 +01:00
vanhofen
a9edf315db rename g_PluginList to g_Plugins; this isn't a list of plugins 
Origin commit data
------------------
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
 2017-03-01 13:03:50 +01:00
vanhofen
0a6086c182 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 6d05bd5d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
 2017-02-23 12:23:43 +01:00
vanhofen
40df044204 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: de1be9b239
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
 2017-02-23 12:22:30 +01:00
vanhofen
fbec2ca240 controlapi: fix perror message 
Origin commit data
------------------
Commit: 7c2e25103f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- controlapi: fix perror message
 2017-02-22 15:25:04 +01:00
vanhofen
b554e7801c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-29 15:15:34 +01:00
vanhofen
081e2c6936 controlapi: add possibility to check for updates 
Origin commit data
------------------
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
 2016-12-24 00:28:07 +01:00
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