Commit Graph

9 Commits

Author SHA1 Message Date
vanhofen
9bd8b2b10c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
2017-03-01 13:09:50 +01:00
vanhofen
29bbc62333 yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5edc857122
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup

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

------------------
This commit was generated by Migit
2017-03-01 11:51:25 +01:00
vanhofen
c258f39d4e NI-yWeb: fix missing %(WEBTVDIR) replacement
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29dff2d772
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-26 (Thu, 26 Jan 2017)

Origin message was:
------------------
- NI-yWeb: fix missing %(WEBTVDIR) replacement

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

------------------
This commit was generated by Migit
2017-01-26 21:36:14 +01:00
vanhofen
27f153c048 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41c29a4210
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-24 (Sat, 24 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-24 00:29:03 +01:00
vanhofen
1b38e15320 NI-yWeb: small whitespace cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9e5fa36af
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-23 (Fri, 23 Dec 2016)

Origin message was:
------------------
- NI-yWeb: small whitespace cleanup

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

------------------
This commit was generated by Migit
2016-12-23 23:45:06 +01:00
vanhofen
b9d92abc00 NIyWeb: fix display of imageinfo ...
and disable online check; needs several fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 477c394f29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-23 (Fri, 23 Dec 2016)

Origin message was:
------------------
- NIyWeb: fix display of imageinfo ...

and disable online check; needs several fixes


------------------
This commit was generated by Migit
2016-12-23 23:40:24 +01:00
Marc Szymkowiak
9ba1fed3ac fix link to developer forum
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4417732462
Author: Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
Date: 2016-12-23 (Fri, 23 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-23 14:12:46 +01:00
vanhofen
42a7ef830b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 14:12:33 +01:00
vanhofen
8ac19456e1 yWeb: move data from /src to /data
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29847283ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)

Origin message was:
------------------
- yWeb: move data from /src to /data

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

------------------
This commit was generated by Migit
2016-12-15 14:00:45 +01:00