Commit Graph

27 Commits

Author SHA1 Message Date
[CST] Focus
d382309a5e nhttp: re-enable threading; lock NeutrinoAPI calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8abb547cca
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-13 (Sat, 13 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-13 11:48:02 +01:00
vanhofen
81d121e2d5 controlapi: allow to get moviebrowser.conf with config call
Origin commit data
------------------
Branch: ni/coolstream
Commit: 809a7dcb45
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-11 (Thu, 11 Feb 2016)

Origin message was:
------------------
- controlapi: allow to get moviebrowser.conf with config call

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

------------------
This commit was generated by Migit
2016-02-11 21:59:24 +01:00
vanhofen
82512848ca yconfig.h: replace another hardcoded path with a variable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ec4194411
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- yconfig.h: replace another hardcoded path with a variable

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

------------------
This commit was generated by Migit
2015-05-06 22:58:54 +02:00
[CST] Focus
86094915e4 nhttpd/yconfig.h: second try to disable threading
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e7f5714cc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-05 (Mon, 05 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-05 14:13:01 +03:00
[CST] Focus
be5c2d321d nhttpd/yconfig.h: disable threading: with global CNeutrinoAPI it is not safe
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d3d6bf238
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-05 (Mon, 05 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-05 13:55:12 +03:00
vanhofen
a6ca39f1f0 Revert "- yWeb: disable threading; there's something to fix"
This reverts commit 79bf2d53bb.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ff097d842
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-23 (Tue, 23 Sep 2014)



------------------
This commit was generated by Migit
2014-09-23 11:45:06 +02:00
vanhofen
79bf2d53bb yWeb: disable threading; there's something to fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91d0f106b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-30 (Sat, 30 Aug 2014)

Origin message was:
------------------
- yWeb: disable threading; there's something to fix

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

------------------
This commit was generated by Migit
2014-08-30 14:07:23 +02: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
martii
04c3aaaba8 nhttpd: extend sendfile mime types (untested)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25c8b3099c
Author: martii <m4rtii@gmx.de>
Date: 2014-07-24 (Thu, 24 Jul 2014)


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

------------------
This commit was generated by Migit
2014-08-26 17:32:06 +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
Stefan Seyfried
2e9fbd20ed neutrino: fix most hardcoded paths
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIlanguage.hpp
	src/gui/bookmarkmanager.h
	src/gui/keybind_setup.cpp
	src/gui/settings_manager.cpp
	src/nhttpd/yconfig.h
	src/nhttpd/yhttpd_mods/Makefile.am
	src/system/localize.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 166e403965
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)



------------------
This commit was generated by Migit
2013-03-12 17:16:13 +04:00
[CST] Bas
3b29bf4abe neutrino make nhttpd depend on neutrino's config.
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1046fd8a5
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-29 01:20:28 +08: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
yjogol
1115d969c1 nhttpd push version to 3.4 (iOS API-Level < 3.4 = API0)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1680 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 26766b5cc6
Author: yjogol <yjogol2@online.de>
Date: 2011-09-09 (Fri, 09 Sep 2011)



------------------
This commit was generated by Migit
2011-09-09 06:17:58 +00:00
yjogol
99ca4c68f6 yweb 2.8.0.7 Dont show phantom bouquets
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@781 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: a3f16be1b5
Author: yjogol <yjogol2@online.de>
Date: 2010-09-17 (Fri, 17 Sep 2010)



------------------
This commit was generated by Migit
2010-09-17 17:08:24 +00:00
yjogol
b5c59d1c86 nhttpd 3.3.3 add mime-type for ts-streaming
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@749 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae883f49a2
Author: yjogol <yjogol2@online.de>
Date: 2010-09-05 (Sun, 05 Sep 2010)



------------------
This commit was generated by Migit
2010-09-05 10:05:02 +00:00
yjogol
4e18634711 nhttpd 3.3.2 Clear EPG for new retrival
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@599 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 384494024e
Author: yjogol <yjogol2@online.de>
Date: 2010-05-25 (Tue, 25 May 2010)



------------------
This commit was generated by Migit
2010-05-25 12:36:57 +00:00
yjogol
d3221479f2 nhttpd add some new configfile handling
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@543 e54a6e83-5905-42d5-8d5c-058d10e6a962


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



------------------
This commit was generated by Migit
2010-04-12 05:32:20 +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
dd84f49caa add new nhttpd-api for external recording-apps <box>/control/timer?format=xml
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@531 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1467a96933
Author: yjogol <yjogol2@online.de>
Date: 2010-03-31 (Wed, 31 Mar 2010)



------------------
This commit was generated by Migit
2010-03-31 08:08:58 +00:00
yjogol
b7112c7a06 yweb 2.8.0.3 new logo handling and some fixes to EPG Plus
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@530 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9823c3a34a
Author: yjogol <yjogol2@online.de>
Date: 2010-03-27 (Sat, 27 Mar 2010)



------------------
This commit was generated by Migit
2010-03-27 18:00:24 +00:00
yjogol
46bccf520b nhttpd: update the default logo path
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@504 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: c487ef6807
Author: yjogol <yjogol2@online.de>
Date: 2010-03-18 (Thu, 18 Mar 2010)



------------------
This commit was generated by Migit
2010-03-18 18:30:43 +00:00
yjogol
191bccda59 yweb: 2.8.0.0 Release
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@483 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9dff920fb8
Author: yjogol <yjogol2@online.de>
Date: 2010-03-14 (Sun, 14 Mar 2010)



------------------
This commit was generated by Migit
2010-03-14 07:55:42 +00:00
yjogol
1df251dfbd yweb: new version number 2.8.b.4, nhttpd 3.2.4
- add /control/crypt for crypto information
- add crypto information to streaminfo

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7187da658
Author: yjogol <yjogol2@online.de>
Date: 2010-03-13 (Sat, 13 Mar 2010)



------------------
This commit was generated by Migit
2010-03-13 10:10:47 +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
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