Commit Graph

23 Commits

Author SHA1 Message Date
vanhofen
b67368c624 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 221e4b5c04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 08:35:14 +01:00
GetAway
cc37e37e40 change to CURLOPT_CONNECTTIMEOUT_MS and ...
use a connect_timeout of 300ms for remote timer


Origin commit data
------------------
Branch: ni/coolstream
Commit: c1f788ac42
Author: GetAway <get-away@t-online.de>
Date: 2017-02-07 (Tue, 07 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 08:33:48 +01:00
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +01:00
Stefan Seyfried
70cbcb6bb5 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
------------------
Branch: ni/coolstream
Commit: e490f84ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
vanhofen
d973ee9821 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/httptool.cpp
	src/system/httptool.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: d376b79ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-26 (Wed, 26 Oct 2016)



------------------
This commit was generated by Migit
2016-10-26 23:46:59 +02:00
FlatTV
d360e11bbc system/httptool: make timeouts flexible
Signed-off-by: M. Liebmann <git@tuxcode.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: f62a3ada8b
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-09-07 (Wed, 07 Sep 2016)



------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
vanhofen
108cf42786 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



------------------
This commit was generated by Migit
2016-10-21 11:23:51 +02:00
TangoCash
3d3605983f adding remote timer (experimental)
switch record timers to remote box or back with "play"-key


Origin commit data
------------------
Branch: ni/coolstream
Commit: 716e9f4d9b
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



------------------
This commit was generated by Migit
2016-10-21 10:47:37 +02:00
vanhofen
1afef53db4 httptool: add missing CURLOPT_SSL_VERIFYPEER curl option
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d8f4959ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-11 (Tue, 11 Oct 2016)

Origin message was:
------------------
- httptool: add missing CURLOPT_SSL_VERIFYPEER curl option

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

------------------
This commit was generated by Migit
2016-10-11 22:12:44 +02:00
vanhofen
9a737d7526 completion of 1d14f8630a
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb5bdc0066
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)

Origin message was:
------------------
- completion of 1d14f8630a

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

------------------
This commit was generated by Migit
2016-08-04 00:40:22 +02:00
FlatTV
5ec334a785 system/httptool: make timeouts flexible
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8423c3356b
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-09 (Sat, 09 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-09 14:58:40 +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
[CST] Focus
c692723a11 system/httptool.cpp: add CURLOPT_FAILONERROR to fail on 4xx errors
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6dedf148f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-09-08 (Tue, 08 Sep 2015)


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

------------------
This commit was generated by Migit
2015-09-17 13:59:04 +03:00
Stefan Seyfried
189e55ec30 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
Thilo Graf
e990abf516 CProgressWindow: implement CComponent classes
This implement window functionality from CComponentsWindow,
progress items from CProgressBar() and status text
items from CComponentsLabel()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f0e4e1687
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-09 (Mon, 09 Jun 2014)



------------------
This commit was generated by Migit
2014-06-23 18:43:47 +02:00
Michael Liebmann
9cf6b04250 SNeutrinoSettings: convert more char[...] configuration values to std::string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 004aa84e32
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
vanhofen
65cbab0307 Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit c266f96560.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:40:16 +01:00
Stefan Seyfried
c266f96560 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-13 10:40:03 +01:00
Jacek Jendrzej
b021be7aa1 if curl version
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86632f0369
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-12 (Wed, 12 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-12 18:28:11 +02:00
[CST] Focus
26dc840441 Set connect timeout to 10 seconds, search for updates takes too long in case host not answer
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1887 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81335a3edd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-25 (Fri, 25 Nov 2011)



------------------
This commit was generated by Migit
2011-11-25 08:55:33 +00:00
gixxpunk
407a62a18d fix compilation with libcurl >= 7.21.7
Long time deprecated <curl/types.h> was completely removed in libcurl 7.21.7. If CST also uses newer libcurl <curl/types.h> defines can savely be removed.
Until then use "-DNEW_LIBCURL" for libcurl >= 7.21.7.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b80855c4d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-07-04 (Mon, 04 Jul 2011)

Origin message was:
------------------
- fix compilation with libcurl >= 7.21.7

Long time deprecated <curl/types.h> was completely removed in libcurl 7.21.7. If CST also uses newer libcurl <curl/types.h> defines can savely be removed.
Until then use "-DNEW_LIBCURL" for libcurl >= 7.21.7.

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


------------------
This commit was generated by Migit
2011-07-04 10:03:09 +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