Commit Graph

1298 Commits

Author SHA1 Message Date
vanhofen
faa10f0ed6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 11:07:32 +02:00
vanhofen
c20952dba2 locale: minor changes in audioplayer's and pictureviewer's locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a63c3f58b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- locale: minor changes in audioplayer's and pictureviewer's locales

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

------------------
This commit was generated by Migit
2017-06-14 14:57:09 +02:00
vanhofen
e4f4307eb6 vfd-setup: fix brightness setup for CST's boxmodel "Link" ...
and hide the brightness menu for all "Trinity" models. There's no display.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0d367dca9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-12 (Mon, 12 Jun 2017)

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.


------------------
This commit was generated by Migit
2017-06-12 13:14:32 +02:00
vanhofen
5a43934c6b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)



------------------
This commit was generated by Migit
2017-06-10 11:43:50 +02:00
vanhofen
1fc432032a icons: fix size of youtube header icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 02da66755f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-09 (Fri, 09 Jun 2017)

Origin message was:
------------------
- icons: fix size of youtube header icon

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

------------------
This commit was generated by Migit
2017-06-09 14:07:05 +02:00
vanhofen
83cdc44dca fonts: add ubuntumono-r-webfont.ttf
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65f1b6d43e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- fonts: add ubuntumono-r-webfont.ttf

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

------------------
This commit was generated by Migit
2017-06-07 14:07:08 +02:00
vanhofen
cb06d88fe4 icons: change filetypes/folder.png for a better visibility
Origin commit data
------------------
Branch: ni/coolstream
Commit: a94011b4e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- icons: change filetypes/folder.png for a better visibility

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

------------------
This commit was generated by Migit
2017-06-06 17:07:07 +02:00
vanhofen
27fb8a8db8 remove graphic progressbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 675c0dc6f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- remove graphic progressbar

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

------------------
This commit was generated by Migit
2017-06-06 00:09:31 +02:00
vanhofen
6755871162 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)


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

------------------
This commit was generated by Migit
2017-05-30 01:27:37 +02:00
vanhofen
1f1e9a0fb3 icons: move mp3.png from /headers to /filetypes; align icon size
Origin commit data
------------------
Branch: ni/coolstream
Commit: f9bcf9c785
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- icons: move mp3.png from /headers to /filetypes; align icon size

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

------------------
This commit was generated by Migit
2017-05-30 01:24:21 +02:00
vanhofen
0ea8f1633b icons: add filetype-icon for pictures
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47124cd7f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- icons: add filetype-icon for pictures

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

------------------
This commit was generated by Migit
2017-05-30 01:24:21 +02:00
vanhofen
0b9f8c5440 locale: small changes in filebrowser's sort locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9911f8992e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- locale: small changes in filebrowser's sort locales

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

------------------
This commit was generated by Migit
2017-05-30 01:24:21 +02:00
vanhofen
ce88037a70 imdb: add runtime locale; split release-date and runtime
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2bdf1b6ecc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: add runtime locale; split release-date and runtime

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

------------------
This commit was generated by Migit
2017-05-29 12:57:28 +02:00
vanhofen
3188f46c69 imdb: add plot locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: faac9f656a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: add plot locale

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

------------------
This commit was generated by Migit
2017-05-29 12:57:28 +02:00
vanhofen
9926360aee imdb: localize output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47d920a3e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: localize output

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

------------------
This commit was generated by Migit
2017-05-29 11:49:00 +02:00
vanhofen
7836f9742f locale: minor changes in font size locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3cb5652ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- locale: minor changes in font size locales

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

------------------
This commit was generated by Migit
2017-05-23 19:25:04 +02:00
vanhofen
049e4596d3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d8073b910
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)


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

------------------
This commit was generated by Migit
2017-05-23 17:59:21 +02:00
vanhofen
1e81b5f931 locale: clearify locales for external channellogo directory
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4484f759a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- locale: clearify locales for external channellogo directory

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

------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
vanhofen
a93d950357 osd_setup: move channellist_show_channellogo to new logo menu; ...
align locales


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe50c85a3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: move channellist_show_channellogo to new logo menu; ...

align locales


------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
vanhofen
49d1c9d622 osd_setup: add channellogo-setup menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9297bcc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: add channellogo-setup menu

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

------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
vanhofen
dd6ad99925 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c077b22e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-19 (Fri, 19 May 2017)


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

------------------
This commit was generated by Migit
2017-05-19 21:18:09 +02:00
vanhofen
0298255e71 cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7ef6e47fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-17 (Wed, 17 May 2017)

Origin message was:
------------------
- cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"

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

------------------
This commit was generated by Migit
2017-05-17 17:23:22 +02:00
vanhofen
48333f7646 locale: more minor changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: af1e89e656
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- locale: more minor changes

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

------------------
This commit was generated by Migit
2017-05-16 16:43:10 +02:00
vanhofen
bfb6ce5ca1 locale: clearify hints for bisection jumps
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22d36d3e83
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- locale: clearify hints for bisection jumps

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

------------------
This commit was generated by Migit
2017-05-16 15:59:04 +02:00
vanhofen
dd4501697b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)



------------------
This commit was generated by Migit
2017-05-16 15:28:08 +02:00
vanhofen
8bf073a7cd deutsch.locale: minor change
Origin commit data
------------------
Branch: ni/coolstream
Commit: e99b0188ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- deutsch.locale: minor change

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

------------------
This commit was generated by Migit
2017-05-16 15:26:20 +02:00
vanhofen
5705809f1a movieplayer: allow bisectional jumps with RC_page_up/down
based upon code by TangoCash


Origin commit data
------------------
Branch: ni/coolstream
Commit: ca218e5390
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-13 (Sat, 13 May 2017)

Origin message was:
------------------
- movieplayer: allow bisectional jumps with RC_page_up/down

based upon code by TangoCash


------------------
This commit was generated by Migit
2017-05-13 17:45:59 +02:00
vanhofen
631df29056 locale: small changes in EPG Plus titles
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b53914eba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: small changes in EPG Plus titles

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

------------------
This commit was generated by Migit
2017-05-09 14:05:32 +02:00
vanhofen
355698c6f4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66e3c79ee1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)



------------------
This commit was generated by Migit
2017-05-09 13:19:56 +02:00
vanhofen
ab7e287bdf locale: minor changes in EPG-Plus locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 468fbcd79c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: minor changes in EPG-Plus locales

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

------------------
This commit was generated by Migit
2017-05-09 11:40:32 +02:00
vanhofen
cc75e46888 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b76adcc02
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 23:50:19 +02:00
vanhofen
58f78c306b icons: add new icons for epg-button
Origin commit data
------------------
Branch: ni/coolstream
Commit: b44a047e7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- icons: add new icons for epg-button

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

------------------
This commit was generated by Migit
2017-05-08 17:39:34 +02:00
vanhofen
ebd68daa5e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30d4d6e7f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 14:33:53 +02:00
vanhofen
1606092aa6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0624cf4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 14:32:18 +02:00
vanhofen
4df1b65ec0 osd_setup: add new epgplus font
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b7430969a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- osd_setup: add new epgplus font

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
969d3331e4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 053d97363c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-29 21:02:27 +02:00
vanhofen
32fa0cfdf3 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: fdd22d414d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-29 21:01:22 +02:00
vanhofen
440e157ad5 locale: minor changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 923daa87da
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)

Origin message was:
------------------
- locale: minor changes

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

------------------
This commit was generated by Migit
2017-03-29 08:11:36 +02:00
vanhofen
1a928cce60 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


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



------------------
This commit was generated by Migit
2017-03-29 08:05:10 +02:00
Michael Liebmann
352b7f75f8 CStreamInfo2: Add new info items
- Videosystem
 - OSD Resolution


Origin commit data
------------------
Branch: ni/coolstream
Commit: f7cea75f37
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)



------------------
This commit was generated by Migit
2017-03-28 23:56:57 +02:00
vanhofen
4a4762935b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	acinclude.m4


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



------------------
This commit was generated by Migit
2017-03-26 23:25:43 +02:00
Michael Liebmann
1eb46311d5 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9ce33a69a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 18:58:48 +01:00
vanhofen
fb8d5063c8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f47b58c9db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 15:17:28 +01:00
vanhofen
56ccefe22a cables.xml: update WTC SN; thanks to Gorcon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 608c092685
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)

Origin message was:
------------------
- cables.xml: update WTC SN; thanks to Gorcon

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

------------------
This commit was generated by Migit
2017-03-23 12:23:56 +01:00
vanhofen
7d167583ef deutsch.locale: remove obsolete rclock.menueadd entry
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3137e15457
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)

Origin message was:
------------------
- deutsch.locale: remove obsolete rclock.menueadd entry

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

------------------
This commit was generated by Migit
2017-03-21 14:49:12 +01:00
vanhofen
26e23762ca Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


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



------------------
This commit was generated by Migit
2017-03-15 23:45:02 +01:00
vanhofen
45f0ad7d7e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


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



------------------
This commit was generated by Migit
2017-03-15 23:39:43 +01:00
TangoCash
8073cfc4d6 Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81fb3b42fa
Author: TangoCash <eric@loxat.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 22:47:42 +01:00
vanhofen
9713a31d6a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4cab22024f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 22:47:35 +01:00
Michael Liebmann
c636bf6234 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: b190e0c4ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 21:19:08 +01:00