Commit Graph

27 Commits

Author SHA1 Message Date
vanhofen
ab5d217f63 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-09 08:43:52 +02:00
Jacek Jendrzej
a67cecd575 remove double includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-08 21:21:32 +02:00
vanhofen
a8fbb121b4 nhttpd: remove unused mod_testhook
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed68d9dfc6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove unused mod_testhook

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-05 08:49:02 +02:00
vanhofen
4c90ce863f nhttpd: remove obsolete CONFIG_SYSTEM_TUXBOX_COOLSTREAM switch
Origin commit data
------------------
Branch: ni/coolstream
Commit: f53335d533
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove obsolete CONFIG_SYSTEM_TUXBOX_COOLSTREAM switch

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-05 08:49:02 +02:00
vanhofen
b06ccc3719 nhttpd: just cosmetics (remove annoying linebreaks)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cf08d8cbe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: just cosmetics (remove annoying linebreaks)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-05 00:18:14 +02:00
vanhofen
03f7ec5a37 nhttpd: remove obsolete function to show commandline help
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a5ce50569
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove obsolete function to show commandline help

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-05 00:10:10 +02:00
vanhofen
53e127a371 nhttpd: remove non-working and outdated Y_CONFIG_BUILD_AS_DAEMON switch
Origin commit data
------------------
Branch: ni/coolstream
Commit: cfe519bfd9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove non-working and outdated Y_CONFIG_BUILD_AS_DAEMON switch

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-05 00:04:16 +02:00
vanhofen
3bb2a8323b nhttpd: enable mod_sendfile.sendAll by default
Origin commit data
------------------
Branch: ni/coolstream
Commit: f1b443c9b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: enable mod_sendfile.sendAll by default

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-05 00:04:15 +02:00
Stefan Seyfried
b06b9394b7 set threadnames to unique values
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5307e62506
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
2017-06-07 14:17:12 +02:00
Stefan Seyfried
5b78fe01f1 set threadnames to unique values
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e0544cd94
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-28 (Sat, 28 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-03 14:54:49 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
vanhofen
479446afa6 yWeb: port "Tuxbox.DisplayLogos" from martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbc4d110fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-05 (Sun, 05 Apr 2015)

Origin message was:
------------------
- yWeb: port "Tuxbox.DisplayLogos" from martii

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-06 00:04:28 +02:00
Jacek Jendrzej
5afc24dc67 use empty to check string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b5e7b5ba3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-09 17:15:11 +01:00
martii
070b342de4 overload access(2)
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81ca577fb8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-30 (Sun, 30 Jun 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
vanhofen
9f817f8dfa nhttp: enable threading
This is ported from neutrino-mp and contains code by martii and seife
from following commits:
20d3031b8bb47b5af79bf10c385e3564fe5c26dc
93d01c1987726c6ab344f69f799df03d5af8fe7a
363633dc1b9a508e244c7e1e51f6c1bbe699961c
c3e1310a2f727e26ce11669e3aeae78305f87049


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7589a3a9e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-19 (Tue, 19 Aug 2014)

Origin message was:
------------------
- nhttp: enable threading

This is ported from neutrino-mp and contains code by martii and seife
from following commits:
20d3031b8bb47b5af79bf10c385e3564fe5c26dc
93d01c1987726c6ab344f69f799df03d5af8fe7a
363633dc1b9a508e244c7e1e51f6c1bbe699961c
c3e1310a2f727e26ce11669e3aeae78305f87049


------------------
This commit was generated by Migit
2014-08-26 17:32:46 +04:00
vanhofen
5d982a6908 yweb: re-introduce 'WebsiteMain.hosted_directory'
* this directory can be used to host some of your cracy stuff.
 yhtm, yjs and ysh will also parsed now. it is reachable with
 <boxip>/hosted/
* if exist a subdir named 'logos' in this directory you can use
 this as an external logo-dir for yweb too
* path can be configured with '--with-hosted_httpddir=PATH'


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9078775a0a
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-27 (Thu, 27 Jun 2013)

Origin message was:
------------------
- yweb: re-introduce 'WebsiteMain.hosted_directory'

* this directory can be used to host some of your cracy stuff.
 yhtm, yjs and ysh will also parsed now. it is reachable with
 <boxip>/hosted/
* if exist a subdir named 'logos' in this directory you can use
 this as an external logo-dir for yweb too
* path can be configured with '--with-hosted_httpddir=PATH'


------------------
This commit was generated by Migit
2013-06-27 12:20:29 +02:00
[CST] Bas
fe727eb954 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/nhttpd/yhttpd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)



------------------
This commit was generated by Migit
2012-12-07 14:39:05 +08:00
Jacek Jendrzej
c65016492b src/nhttpd: clean code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e4a541781
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-28 19:03:03 +01:00
[CST] Bas
5c5a90ff05 neutrino: fix config file locations.
Origin commit data
------------------
Branch: ni/coolstream
Commit: e426104399
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-13 12:45:17 +08:00
[CST] Bas
5451b4c30e nhttpd: fix compile after include change.
Origin commit data
------------------
Branch: ni/coolstream
Commit: cfea9b493f
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-04 (Sun, 04 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-03-04 15:51:56 +08:00
Jacek Jendrzej
601946476e fix for gcc4.5
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@890 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: d9488d8e77
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-11-27 (Sat, 27 Nov 2010)



------------------
This commit was generated by Migit
2010-11-27 13:17:54 +00:00
yjogol
2957ad8ca9 add support for parsing javascript files (yjs)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@542 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: bcbc815bcc
Author: yjogol <yjogol2@online.de>
Date: 2010-04-10 (Sat, 10 Apr 2010)



------------------
This commit was generated by Migit
2010-04-10 05:35:14 +00:00
yjogol
24e389966c yWeb 2.8.a.4
- updated nhttpd
- Code clean up
- changes to nhttpd.conf
- some changes for logo display

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@416 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: bad0521f6c
Author: yjogol <yjogol2@online.de>
Date: 2010-02-25 (Thu, 25 Feb 2010)



------------------
This commit was generated by Migit
2010-02-25 20:00:09 +00:00
yjogol
1bdb085424 yWeb 2.8.a.3 Alpha-Version
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@406 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32c7517141
Author: yjogol <yjogol2@online.de>
Date: 2010-02-24 (Wed, 24 Feb 2010)



------------------
This commit was generated by Migit
2010-02-24 16:16:10 +00:00
mws
5febb97a76 Mark unused vars as comment
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)



------------------
This commit was generated by Migit
2009-12-21 16:23:09 +00:00
Stefan Seyfried
61bae2e705 fix build with gcc-4.4.x by adding necessary #includes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@56 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 601e6b00fc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2009-12-16 (Wed, 16 Dec 2009)



------------------
This commit was generated by Migit
2009-12-16 08:49:21 +00:00
mrcolor
bcecfb6585 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
------------------
Branch: ni/coolstream
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)



------------------
This commit was generated by Migit
2009-12-08 11:05:11 +00:00