Commit Graph

1866 Commits

Author SHA1 Message Date
vanhofen
f8734b8309 yWeb: fix up/down <-> pageup/pagedown keys; enable sleep key
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a777e82d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-13 (Fri, 13 Oct 2017)

Origin message was:
------------------
- yWeb: fix up/down <-> pageup/pagedown keys; enable sleep key

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

------------------
This commit was generated by Migit
2017-10-13 14:50:13 +02:00
vanhofen
cebea3854a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/infoviewer_bb.cpp


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



------------------
This commit was generated by Migit
2017-10-13 14:13:22 +02:00
vanhofen
0062a38203 add UHD icons to infoviewer
Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: db184e3abe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer

Conflicts:
	src/gui/infoviewer_bb.cpp


------------------
This commit was generated by Migit
2017-10-13 14:10:34 +02:00
vanhofen
d2d00f8d7a yWeb: enable grab to do screenshots
Origin commit data
------------------
Branch: ni/coolstream
Commit: 641346d84b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-13 (Fri, 13 Oct 2017)

Origin message was:
------------------
- yWeb: enable grab to do screenshots

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

------------------
This commit was generated by Migit
2017-10-13 14:06:04 +02:00
Thilo Graf
804ee7b948 CTimerList: localize info and send timer buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: c1d4da731b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-13 12:35:59 +02:00
vanhofen
a98e5fd8f7 audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e264e6334b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.


------------------
This commit was generated by Migit
2017-10-12 08:52:32 +02:00
vanhofen
b9d01bef9a add UHD icons to infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: d367c33842
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer

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

------------------
This commit was generated by Migit
2017-10-12 00:36:45 +02:00
TangoCash
a1ffd4bba0 update webif
Origin commit data
------------------
Branch: ni/coolstream
Commit: d329663148
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-12 00:36:45 +02:00
vanhofen
0a0c8a13bf Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:21:37 +02:00
Jacek Jendrzej
f5fc50139e Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08dc0d7561
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-30 (Sat, 30 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-30 13:22:29 +02:00
vanhofen
61a2b10f7e deutsch.locale: adjust EPGPlus.remind
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17ea8e7d63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)

Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind

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

------------------
This commit was generated by Migit
2017-09-30 13:18:12 +02:00
vanhofen
d50e1b6cc0 deutsch.locale: adjust EPGPlus.remind
Origin commit data
------------------
Branch: ni/coolstream
Commit: 081ac08d86
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)

Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind

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

------------------
This commit was generated by Migit
2017-09-30 10:13:52 +02:00
vanhofen
cd18fa9ca0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
2017-09-25 11:36:34 +02:00
Stefan Seyfried
1736a5fca8 radio-stations.xml: add some Radio BOB! streams
Origin commit data
------------------
Branch: ni/coolstream
Commit: d07e45166e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-25 11:25:52 +02:00
Stefan Seyfried
2d2f9b7903 radio-stations.xml: clean out nonworking entries
Remove all entries that give plain 404 errors or where the host
name cannot be resolved.
Left in some where the playlist url redirects to unreachable hosts
because that might be a temporary failure.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c3b5af06a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
2017-09-25 11:25:52 +02:00
vanhofen
83be9c1fe3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 21:53:44 +02:00
Jacek Jendrzej
8a451b3cdf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea89db1ec2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-16 13:26:53 +02:00
vanhofen
bee773c61a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e868c860a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)



------------------
This commit was generated by Migit
2017-09-16 13:01:20 +02:00
Jacek Jendrzej
af4f69402f remove unused locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: be671bcdc9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-16 12:53:03 +02:00
Jacek Jendrzej
06ce66bbd8 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-15 20:44:49 +02:00
vanhofen
7fda7b7b5a icons: rename slider icons to more logical names
Origin commit data
------------------
Branch: ni/coolstream
Commit: cd539af1f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: rename slider icons to more logical names

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

------------------
This commit was generated by Migit
2017-09-15 20:18:26 +02:00
vanhofen
19e717043e icons: new slider icons with material colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb22f29d3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: new slider icons with material colors

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

------------------
This commit was generated by Migit
2017-09-15 20:17:07 +02:00
vanhofen
db665c0704 keychooser: strip unneeded code; use hintbox instead of handcrafted paints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5370086103
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints

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

------------------
This commit was generated by Migit
2017-09-15 16:34:23 +02:00
vanhofen
62784fee02 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4701fdcb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-15 12:53:19 +02:00
vanhofen
70872b11ac keychooser: strip unneeded code; use hintbox instead of handcrafted paints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04c1cbe15e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints

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

------------------
This commit was generated by Migit
2017-09-15 12:41:06 +02:00
vanhofen
673f1580ec Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b72cda244d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 22:02:00 +02:00
vanhofen
e54707c21c icons: rename slider icons to more logical names
Origin commit data
------------------
Branch: ni/coolstream
Commit: b00caf1c31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: rename slider icons to more logical names

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

------------------
This commit was generated by Migit
2017-09-14 22:00:41 +02:00
vanhofen
30dc46a245 icons: new slider icons with material colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b09d125fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: new slider icons with material colors

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

------------------
This commit was generated by Migit
2017-09-14 21:37:44 +02:00
Jacek Jendrzej
e250ac7837 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 13:54:04 +02:00
vanhofen
d86625c8b2 get sure we have the logo-dir, even if it's empty
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ace914324
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- get sure we have the logo-dir, even if it's empty

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
dfab273050 locale: small changes; unify save/load locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 76fafe584d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- locale: small changes; unify save/load locales

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
ebfd3462ef yWeb: align cifs-mounts to new automount-syntax
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- yWeb: align cifs-mounts to new automount-syntax

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
a03ad78142 y-web: show hostname as page-title
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: c06e5e114a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)

Origin message was:
------------------
- y-web: show hostname as page-title

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
f5ce8f5842 y-web: remove white background from favicon
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5477bed480
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)

Origin message was:
------------------
- y-web: remove white background from favicon

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
0a58d1e685 locale: small changes in update locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9112e85cd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-29 (Tue, 29 Aug 2017)

Origin message was:
------------------
- locale: small changes in update locales

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
Jacek Jendrzej
8333edc0fb Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98a31ea821
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 15:53:42 +02:00
vanhofen
fec79fd522 rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: d23323758c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code

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

------------------
This commit was generated by Migit
2017-09-13 15:52:19 +02:00
vanhofen
5de0c243cc Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0f93d9281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 15:07:03 +02:00
vanhofen
46e5e5e202 rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56cdb2dd6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code

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

------------------
This commit was generated by Migit
2017-09-13 14:46:38 +02:00
Jacek Jendrzej
bea20473aa Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 13:40:40 +02:00
vanhofen
73b2025641 remove unused nkplay stuff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 932a535b6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
2017-09-13 13:35:23 +02:00
vanhofen
9b9e405f04 drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
2017-09-13 13:35:23 +02:00
vanhofen
fadeac1d43 remove unused nkplay stuff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93c8768fbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
2017-09-13 13:09:34 +02:00
vanhofen
b6b296939a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf366676b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
2017-09-13 12:52:23 +02:00
vanhofen
aa1cd4ace0 locale: minor changes; fix typo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3742ca7dfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- locale: minor changes; fix typo

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

------------------
This commit was generated by Migit
2017-09-13 10:45:23 +02:00
vanhofen
2097d7e876 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
2017-09-13 08:36:25 +02:00
vanhofen
274dbc2d1e drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
2017-09-12 23:46:22 +02:00
vanhofen
e6d2ba00b3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
2017-09-12 22:32:07 +02:00
vanhofen
f8e1da4418 network-setup: small changes in locales; move npt-at-boot item up
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92a8ee74f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- network-setup: small changes in locales; move npt-at-boot item up

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

------------------
This commit was generated by Migit
2017-09-12 22:30:35 +02:00
vanhofen
208270eed9 drop ni-menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7379101512
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop ni-menu

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

------------------
This commit was generated by Migit
2017-09-12 22:30:35 +02:00