Conflicts:
src/gui/epgview.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
------------------
This commit was generated by Migit
reduce content classification caching (leaving old code with ifdef)
Origin commit data
------------------
Branch: ni/coolstream
Commit: e8700de2b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-30 (Fri, 30 Jan 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c624505818
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-29 (Thu, 29 Jan 2015)
Origin message was:
------------------
make channel_id private, use getChannelID()
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
...and make sure they are actally used everywhere
This is the correct fix for 9715cfaba2
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35c331de69
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-28 (Wed, 28 Jan 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c41c7b3002
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b5e7b5ba3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 558f372dae
Author: Jacek Jendrzej <overx300@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
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
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
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
Origin commit data
------------------
Branch: ni/coolstream
Commit: a92eb8f8e7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-02 (Fri, 02 Jan 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44451c7575
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-26 (Fri, 26 Dec 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41dd237498
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f236b4807b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-12-23 (Tue, 23 Dec 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24fabb8daf
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Origin message was:
------------------
- yWeb: remove unused/obsolete bootoptions blocks
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c63297f0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Origin message was:
------------------
- yWeb: cleanup from unused esound stuff
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35b4cc1483
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Origin message was:
------------------
- yWeb: use an include-block to paint submit/apply buttons
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 069defa31c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Origin message was:
------------------
- controlapi: fix horrible typo
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ff65299d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Origin message was:
------------------
- controlapi: cleanup from unused esound rests
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bf97d21f1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Origin message was:
------------------
- yWeb: (re)add EPG settings menu
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec219cc2a7
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Origin message was:
------------------
- yWeb: fix neutrino_pictureviewer_save_settings block
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f3c77734c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c8f0c68cf6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
based on idea by Moritz Venn <moritz.venn@freaque.net>
Signed-off-by: Christian Schuett <Gaucho316@hotmail.com>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59ca850ecc
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2014-11-02 (Sun, 02 Nov 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 847b08aedb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-05 (Wed, 05 Nov 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f16c9441e
Author: Benny <Benny@users.noreply.github.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee1ab08bd4
Author: martii <m4rtii@gmx.de>
Date: 2014-09-23 (Tue, 23 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/system/settings.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: a99e8df965
Author: martii <m4rtii@gmx.de>
Date: 2013-12-24 (Tue, 24 Dec 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 38bdf512b0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-08-30 (Sat, 30 Aug 2014)
Origin message was:
------------------
- yWeb: set RangeEnd
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
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
Origin commit data
------------------
Branch: ni/coolstream
Commit: 270e915954
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-30 (Sat, 30 Aug 2014)
Origin message was:
------------------
- yWeb: try to fix empty pages
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
initial code (C) martii,
initial patch from jacek
Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
------------------
This commit was generated by Migit
TODO: Y_Tools_Check_Install.yhtm
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f3a81a028
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)
Origin message was:
------------------
- yWeb: remove some links to yjogol.com; site is down
TODO: Y_Tools_Check_Install.yhtm
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a694cc029
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)
Origin message was:
------------------
- yWeb: add hddtools extention source
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b1933f5f1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)
Origin message was:
------------------
- yWeb: add filemanager extention source
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54ac45384a
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)
Origin message was:
------------------
- yWeb: add boxinfo extention source
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
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
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c3952cf42
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Origin message was:
------------------
- nhttp: some minor code optimizations
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
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
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bf0d833cd
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
(This re-applies most of the patches I've reverted about two hours ago.)
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff46970457
Author: martii <m4rtii@gmx.de>
Date: 2014-07-20 (Sun, 20 Jul 2014)
------------------
This commit was generated by Migit
This reverts commit 9842afecad8dfb91dfd7221aedbeaf5379a89534.
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf0bf3fa20
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-08-17 (Sun, 17 Aug 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: d71958ba8c
Author: martii <m4rtii@gmx.de>
Date: 2014-07-20 (Sun, 20 Jul 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf42b7c4cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Origin message was:
------------------
- yWeb: show correct RCU at Zee²
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
