mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,932 Commits 2 Branches 9 Tags
d94ba3259b085cc3a558a3396e4a6f7fd72fac6d
Commit Graph

16 Commits

Author SHA1 Message Date
Stefan Seyfried
4895797537 dboxinfo: allow to show "neutrino uptime" 
Origin commit data
------------------
Commit: a98f94621a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
 2017-12-26 22:58:37 +01:00
vanhofen
c4de218cb2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 13:19:03 +01:00
Stefan Seyfried
f6d5a96838 replace fontrenderer.h include with forward declaration 
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
 2017-02-07 17:23:42 +01:00
Stefan Seyfried
8b4c30e093 replace framebuffer.h include with forward declaration 
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)


Origin commit data
------------------
Commit: e490f84ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
 2017-02-07 17:23:42 +01: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
Thilo Graf
694fea40ad CDBoxInfoWidget: remove superfluous paint of header 
Origin commit data
------------------
Commit: d8e3ecfa1d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-22 (Tue, 22 Mar 2016)
 2016-03-22 13:15:19 +01:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
martii
bb0239bd4c gui/dboxinfo: localize (partially based on patch from Benny -- thanks!) 
Conflicts:
	src/gui/dboxinfo.cpp


Origin commit data
------------------
Commit: 742760dbd3
Author: martii <m4rtii@gmx.de>
Date: 2014-05-24 (Sat, 24 May 2014)
 2014-09-11 18:12:06 +04:00
Stefan Seyfried
16942ab183 Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
 2014-01-05 18:31:31 +01:00
martii
1831ae6c21 gui/dboxinfo: adjust spacing 
Origin commit data
------------------
Commit: 5e9af14eb5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-02 (Thu, 02 Jan 2014)
 2014-01-04 12:26:08 +01:00
martii
7e9d41f23d gui/dboxinfo: move cpu load calculation to dedicated thread ... 
... that keeps history; show load graph


Origin commit data
------------------
Commit: 6fff156164
Author: martii <m4rtii@gmx.de>
Date: 2013-12-30 (Mon, 30 Dec 2013)
 2013-12-30 01:51:20 +01:00
vanhofen
bdc4c1b124 Revert "gui/dboxinfo: move cpu load calculation to dedicated thread ..." 
This reverts commit 9ce61523af.


Origin commit data
------------------
Commit: 7fbe179a1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-30 (Mon, 30 Dec 2013)
 2013-12-30 01:51:08 +01:00
vanhofen
9ce61523af gui/dboxinfo: move cpu load calculation to dedicated thread ... 
... that keeps history; show load graph


Origin commit data
------------------
Commit: ce18925333
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-30 (Mon, 30 Dec 2013)
 2013-12-30 01:34:07 +01:00
Stefan Seyfried
a25e481b13 dboxinfo: use more suitable column widths 
Origin commit data
------------------
Commit: 81f71c2847
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-30 (Mon, 30 Dec 2013)
 2013-12-30 01:31:57 +01:00
vanhofen
d7bbc85c91 dboxinfo: switch to new martii boxinfo + adaptation 
Origin commit data
------------------
Commit: 8ceb480ee5
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)

Origin message was:
------------------
- dboxinfo: switch to new martii boxinfo + adaptation
 2013-12-29 21:51:35 +01:00
mrcolor
cb8dd3394d our current experimental Neutrino branch 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
 2009-12-08 11:05:11 +00:00