Commit Graph

15 Commits

Author SHA1 Message Date
Jacek Jendrzej
5288c70665 neutrino use check empty() instead of length() or size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-03 (Sat, 03 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-03 17:51:08 +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
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
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
vanhofen
77fb6ce550 mod_yparser: add a command to create comments
Origin commit data
------------------
Branch: ni/coolstream
Commit: 03132b1f95
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-26 (Thu, 26 Jul 2012)

Origin message was:
------------------
- mod_yparser: add a command to create comments

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

------------------
This commit was generated by Migit
2012-07-26 21:45:15 +02:00
Jacek Jendrzej
5ed8825b21 use empty() instead of size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()

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

------------------
This commit was generated by Migit
2012-06-16 09:44:42 +02:00
[CST] Focus
558497f4ae comment some found not used variables
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e06495776
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)


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

------------------
This commit was generated by Migit
2012-05-08 16:18:16 +04:00
Stefan Seyfried
8c43bb8ed6 neutrino/nhttpd: fix compiler warning in mod_yparser
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1817 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2127e63da2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-11-05 (Sat, 05 Nov 2011)



------------------
This commit was generated by Migit
2011-11-05 11:36:01 +00:00
yjogol
217073c3e9 nhttpd: allows relative path for scripts
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@557 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: ad0cf74ee3
Author: yjogol <yjogol2@online.de>
Date: 2010-05-01 (Sat, 01 May 2010)



------------------
This commit was generated by Migit
2010-05-01 10:40:01 +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
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