Commit Graph

21 Commits

Author SHA1 Message Date
gixxpunk
1dc592af4c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43bdc2be1c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-16 13:13:03 +02:00
TangoCash
5204cf2a3b supplemental to f34899d430
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5256a11e66
Author: TangoCash <eric@loxat.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-15 21:09:28 +02:00
Thilo Graf
8c864a4b9c neutrinoapi.cpp: fix possible broken build
error: ‘to_string’ was not declared...

to_string is handled inside helpers.h/cpp.
include of <system/helpers.h> is required here.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f0891cb76f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 20:56:08 +02:00
gixxpunk
949024a3aa fix compile after f34899d
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4da5b0d606
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- fix compile after f34899d

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

------------------
This commit was generated by Migit
2017-06-15 17:30:34 +02:00
TangoCash
f34899d430 [RemoteTimers] add possibility to transfer all timers at once via webif
Use:
http://boxip/control/sendalltimers?ip=10.1.1.xxx&force=1
http://boxip/control/sendalltimers?name=record%20box&force=true

if parameter name is given, it has to be in timerlist as remote box.
if parameter ip and name is given, ip is used.
if parameter force is set, all checks are disabled, and the local timer
will be deleted even the transfer was not successful.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7031e99573
Author: TangoCash <eric@loxat.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 16:34:19 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
3f71bf4b1f tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e283469db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile()

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

------------------
This commit was generated by Migit
2016-08-26 16:05:45 +02:00
martii
cb4b093b11 nhttpd/neutrinoapi: fix getLogoFile()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b66c1e9f0f
Author: martii <m4rtii@gmx.de>
Date: 2014-03-11 (Tue, 11 Mar 2014)


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

------------------
This commit was generated by Migit
2016-08-26 16:05:45 +02:00
Jacek Jendrzej
8525df611a nhttpd use epg id to get events
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52f4312aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-11 (Wed, 11 May 2016)


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

------------------
This commit was generated by Migit
2016-05-11 12:52:11 +02:00
Jacek Jendrzej
bf98b30b00 nhttpd: unused var and function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 136955157d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
nhttpd: unused var and function

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

------------------
This commit was generated by Migit
2016-03-19 16:13:56 +01:00
[CST] Focus
a5be5f3911 nhttpd: try to fix threaded nhttp crashes (again)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14a73c3b80
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-08 18:05:34 +03:00
[CST] Focus
70ea917953 nhttpd/tuxboxapi/controlapi.cpp: add direct record start for current channel
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc11a76c01
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-02 (Wed, 02 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-02 14:30:51 +03:00
vanhofen
111dd29ea8 neutrinoapi: localize some hardcoded stings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25af9dea82
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-20 (Sat, 20 Feb 2016)

Origin message was:
------------------
- neutrinoapi: localize some hardcoded stings

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

------------------
This commit was generated by Migit
2016-02-20 15:32:54 +01:00
[CST] Focus
9b5c7aeb1f nhttp: change mutex type to recursive
Origin commit data
------------------
Branch: ni/coolstream
Commit: ecb5e06128
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-16 18:56:10 +03:00
[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
[CST] Focus
b06cb7a792 nhttpd/tuxboxapi/neutrinoapi.cpp: remove setServiceChanged calls after zap
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a45735eba
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-02 12:26:26 +03:00
vanhofen
427915ab83 src/nhttpd/tuxboxapi: remove unused dbox code
Origin commit data
------------------
Branch: ni/coolstream
Commit: e59f8adccc
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- src/nhttpd/tuxboxapi: remove unused dbox code

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

------------------
This commit was generated by Migit
2015-05-06 22:59:04 +02: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
[CST] Focus
b4e06b4d0b Removed libcontrold dependency
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@336 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 35d7d555b6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-14 (Sun, 14 Feb 2010)



------------------
This commit was generated by Migit
2010-02-14 13:09:07 +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