Commit Graph

750 Commits

Author SHA1 Message Date
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
vanhofen
4af96e1b6d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-21 00:14:20 +01:00
TangoCash
083df328e1 add option to read saved epg data frequently
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6cd5dd8e23
Author: TangoCash <eric@loxat.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-20 19:24:08 +01:00
vanhofen
70d2c535ae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/nhttpd/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)



------------------
This commit was generated by Migit
2016-11-16 23:43:57 +01:00
Stefan Seyfried
0f5446036c make sure the private dvb headers are used on coolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 045587f6ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-16 20:30:14 +01:00
vanhofen
30bd7aa4cc Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cb9b4b1d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)



------------------
This commit was generated by Migit
2016-11-13 01:34:20 +01:00
Stefan Seyfried
d8d4d753a5 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-12 18:06:26 +01:00
vanhofen
6dfe9dc9ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
2016-11-02 09:50:10 +01:00
vanhofen
da08c55473 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-29 11:41:02 +02:00
TangoCash
0e87207cab add possibility to add Name,Url,Port, Username and Password if needed.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3776340268
Author: TangoCash <eric@loxat.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-28 22:20:27 +02:00
vanhofen
8474ef8c98 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 13:08:01 +02:00
vanhofen
59c83b2c70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:30:10 +02:00
vanhofen
06167cc8d0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-23 21:57:00 +02:00
Stefan Seyfried
58f77a1311 fix Makefiles to include SIGC_CFLAGS
now that the framebuffer class includes libsigc++, the path
to it must be known to all parts using framebuffer.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 944a4e4ecd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-23 17:22:16 +02:00
Stefan Seyfried
0c4456386f libmd5sum: use tuxbox upstream code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 727d56d69a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-23 16:59:32 +02:00
Stefan Seyfried
43ac9473e5 remove obsolete embedded libtriple
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
(forward ported neutrino-mp commit 9fc6c24a21)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 57078ed23d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)



------------------
This commit was generated by Migit
2016-10-23 12:19:06 +02:00
Stefan Seyfried
4fb9a66f39 fix Makefiles to include SIGC_CFLAGS
now that the framebuffer class includes libsigc++, the path
to it must be known to all parts using framebuffer.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a9373c262
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:50:38 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
d35d014a76 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


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



------------------
This commit was generated by Migit
2016-10-21 11:30:48 +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
1f467ce4f2 varius fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb26f93d98
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-21 10:47:37 +02:00
TangoCash
5de9f564aa add multiple remote boxes
Origin commit data
------------------
Branch: ni/coolstream
Commit: f354089763
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-21 10:47:37 +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
martii
5967b5f2c3 timerd: adjust recording timers to epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: c07b0f0b6c
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-26 13:04:48 +02:00
vanhofen
1eae0a97f3 Merge branch 'ni/cst-next' into ni/mp/cst-next
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)



------------------
This commit was generated by Migit
2016-09-20 08:22:22 +02:00
martii
2b6a4a3718 [experimental] timerd: adjust recording timers to epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe2d351750
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-15 00:48:06 +02:00
vanhofen
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
a19fe6bed0 Fix merge conflicts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-20 09:01:33 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
1d14f8630a add/use //NI tags instead of /*NI*/; just cosmetic changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7927af07cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- add/use //NI tags instead of /*NI*/; just cosmetic changes

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

------------------
This commit was generated by Migit
2016-07-31 21:04:37 +02:00
FlatTV
c4bbe2a4fb Merge branch 'ni/cst-next' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: cff7efddc4
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-10 (Sun, 10 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-10 21:44:58 +02:00
FlatTV
8c47e9a1fd Ask user for storing overlapping CI timer from epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7543aa602c
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-10 (Sun, 10 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-10 21:44:30 +02:00
gixxpunk
2e09d77141 use default values for freetype fontcaches (needs testing!)
Origin commit data
------------------
Branch: ni/coolstream
Commit: e6fafadcea
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-07-07 (Thu, 07 Jul 2016)

Origin message was:
------------------
- use default values for freetype fontcaches (needs testing!)

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

------------------
This commit was generated by Migit
2016-07-07 17:46:18 +02:00
gixxpunk
a376190b02 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8167e518ae
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-06-26 (Sun, 26 Jun 2016)


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

------------------
This commit was generated by Migit
2016-06-26 22:14:15 +02:00
Thilo Graf
f78bcc297f dvbsubtitle.cpp: fix wconversion compiler warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9aab3ed81
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-16 (Sat, 16 Apr 2016)


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

------------------
This commit was generated by Migit
2016-06-26 15:32:35 +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
Jacek Jendrzej
beae26be1d some never read compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-24 17:18:37 +02:00
Jacek Jendrzej
bd516dedb4 lib/libdvbsub/tools.h unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: c804997045
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-16 (Sat, 16 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-16 18:07:16 +02:00
[CST] Focus
53f9bd83a5 lib/libcoolstream2/cs_api.h: update header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16cbac13fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-04-14 (Thu, 14 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-14 17:28:32 +03:00
[CST] Focus
df98594b5b libcoolstream2/playback_cs.h: update header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9bb3cdf3ec
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-28 (Mon, 28 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-28 13:29:57 +03:00
[CST] Focus
23fc75ed1a libcoolstream2/playback_cs.h: update header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 427936c874
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-25 (Fri, 25 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-25 19:04:32 +03:00
vanhofen
7615e8eac0 adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19154192db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP

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

------------------
This commit was generated by Migit
2016-03-03 11:18:15 +01:00
[CST] Focus
68b470815e libdvbsub/dvbsub.cpp: fix pid reporting on resume
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ec81142c4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-02 (Tue, 02 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-03 18:29:50 +03:00
Michael Liebmann
cad1407f90 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f628ca6af8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-28 05:32:50 +01:00
Jacek Jendrzej
94712b9e14 jsoncpp.cpp: re-apply gcc version compil fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a72274efb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-26 14:11:33 +01:00
Michael Liebmann
aebe47f293 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed99066466
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-26 06:55:54 +01:00
Michael Liebmann
9a540a713a Revert 'Adapt neutrino-mp for CST hardware part #2'
This reverts commit 517b71f613


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c4105a689
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)



------------------
This commit was generated by Migit
2016-01-26 05:50:38 +01:00
[CST] Focus
17232ec523 gui/movieplayer.cpp: pass subtitles charset to playback instance
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85c437fac3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-25 18:16:16 +03:00
Michael Liebmann
b7d36e8aec libcoolstream: Add boxarch to hw_caps
Origin commit data
------------------
Branch: ni/coolstream
Commit: 514d6344a6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-25 13:53:39 +01:00
Stefan Seyfried
2480799caf hardware_caps: more boxtypes, add boxarch
Origin commit data
------------------
Branch: ni/coolstream
Commit: 71d4ec8339
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-22 (Fri, 22 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-22 19:48:09 +01:00