mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,978 Commits 2 Branches 9 Tags
d0dc31ae8d0a2e54ad17585874dc0249f7d78eb2
Commit Graph

23 Commits

Author SHA1 Message Date
vanhofen
d0dc31ae8d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/update_settings.cpp


Origin commit data
------------------
Commit: aeebd0d444
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
 2017-09-14 16:30:58 +02:00
Jacek Jendrzej
f05782514f remove unused 
Origin commit data
------------------
Commit: 97442240f8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
 2017-09-14 13:29:47 +02:00
vanhofen
ba3313b04f file.cpp|h: port filetypes handling from martii 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 37e2efb3ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- file.cpp|h: port filetypes handling from martii

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-07 14:17:12 +02:00
vanhofen
cde9e06399 file.cpp|h: port filetypes from TangoCash 
Origin commit data
------------------
Commit: 4024171041
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- file.cpp|h: port filetypes from TangoCash
 2017-06-07 14:17:12 +02:00
vanhofen
b4fecd0bdb Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)
 2017-05-30 01:27:37 +02:00
vanhofen
c5a3d26290 file.cpp|h: port filetypes handling from martii 
Origin commit data
------------------
Commit: 8f7d4e6e8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- file.cpp|h: port filetypes handling from martii
 2017-05-30 01:24:21 +02:00
vanhofen
eaa2fd0c3e file.cpp|h: port filetypes from TangoCash 
Origin commit data
------------------
Commit: 04d23095c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- file.cpp|h: port filetypes from TangoCash
 2017-05-30 01:24:21 +02:00
Stefan Seyfried
8822421c6b Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
 2015-12-28 16:15:14 +01:00
Thilo Graf
ecb186b43c CFile: add filetypes for install and update packages 
Origin commit data
------------------
Commit: 7ada20de64
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-21 (Sun, 21 Dec 2014)
 2015-12-28 12:13:41 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
Jacek Jendrzej
519b645c1d audioplayer: -add flv format (THX Houdini) 
Origin commit data
------------------
Commit: 29aa47aef0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-07-27 (Mon, 27 Jul 2015)
 2015-07-27 12:40:41 +02: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
[CST] Focus
b5231850cf driver/file.cpp: cache file type 
Origin commit data
------------------
Commit: b70a2998f5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)
 2014-10-01 16:13:04 +04:00
[CST] Focus
2b27f4fed4 driver/file.h: add isDir() 
Origin commit data
------------------
Commit: 7660fa52cb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
 2014-09-30 14:07:34 +04:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
[CST] Focus
eba4387004 driver/file.cpp: add iso file type 
Origin commit data
------------------
Commit: e1c7198ed8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-25 (Tue, 25 Feb 2014)
 2014-02-25 16:48:54 +04:00
Stefan Seyfried
8d876ff4ef Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing


Origin commit data
------------------
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 21:25:05 +01:00
[CST] Focus
0b8d2bea20 driver/file.cpp: add AAC file type, add .dts extension 
Origin commit data
------------------
Commit: 77f28b6825
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-10 (Tue, 10 Dec 2013)
 2013-12-15 14:40:54 +04:00
Stefan Seyfried
a5719682b9 Revert "driver/file.h: define __USE_FILE_OFFSET64 instead of error" 
This reverts commit 9ebe1da39f.
Just defining it at one place is wrong and papers over the real bugs.


Origin commit data
------------------
Commit: e12ed231ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)
 2012-11-11 01:50:53 +01:00
Stefan Seyfried
857402e3d4 Merge branch 'uncool/dvbsi++' 
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


Origin commit data
------------------
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)
 2012-11-11 01:45:22 +01:00
[CST] Focus
9ebe1da39f driver/file.h: define __USE_FILE_OFFSET64 instead of error 
Origin commit data
------------------
Commit: 02c3cfb173
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-07 (Wed, 07 Nov 2012)
 2012-11-07 20:49:06 +04:00
Stefan Seyfried
3cf264b99f fixes for 64bit archs: don't assume a pointer is 32bit wide 
Origin commit data
------------------
Commit: d806eeb544
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-06 (Sat, 06 Oct 2012)
 2012-10-07 17:09:17 +02: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