mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,267 Commits 2 Branches 9 Tags
ace2bc3f53bbfbdcc8e331c0593e3533a12a7eb1
Commit Graph

1816 Commits

Author SHA1 Message Date
Thilo Graf
38077fb8d1 icons: add missing tv and radio markers 
Origin commit data
------------------
Commit: 22d92ebb94
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)
 2018-01-03 22:35:02 +01:00
vanhofen
6ea9cc9e45 yWeb: activate RC-sub keys on remote controls 
Origin commit data
------------------
Commit: be821ed1c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- yWeb: activate RC-sub keys on remote controls
 2018-01-03 09:17:30 +01:00
vanhofen
5176333e4b deutsch.locale: fix merge error leftovers 
Origin commit data
------------------
Commit: 21bc82c001
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-28 (Thu, 28 Dec 2017)

Origin message was:
------------------
- deutsch.locale: fix merge error leftovers
 2017-12-28 21:48:20 +01:00
Stefan Seyfried
4b354f9914 deutsch.locale: fix typo 
Origin commit data
------------------
Commit: 120cc5befa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
 2017-12-26 22:58:36 +01:00
vanhofen
7a48382781 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	ChangeLog
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/filebrowser.cpp
	src/gui/filebrowser.h
	src/gui/mediaplayer.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 0caa10ef43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-21 (Thu, 21 Dec 2017)
 2017-12-21 22:28:12 +01:00
Thilo Graf
9a1f55a748 Fileplay: add separat fileplay for audio and video 
Origin commit data
------------------
Commit: 91ee69f22e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-21 (Thu, 21 Dec 2017)
 2017-12-21 12:10:40 +01:00
vanhofen
86f4e21779 locale: split fileplay hints into audio and video 
Origin commit data
------------------
Commit: 8115cf24ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- locale: split fileplay hints into audio and video
 2017-12-19 12:46:04 +01:00
Thilo Graf
78163448f6 Icons: use fixed language and youtube icon 
Format was wrong.


Origin commit data
------------------
Commit: c91cb3aada
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-18 (Mon, 18 Dec 2017)
 2017-12-18 22:24:48 +01:00
Thilo Graf
67a5287f57 Icons: use default hint from own icon set 
Origin commit data
------------------
Commit: d2c2ec070d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-18 (Mon, 18 Dec 2017)
 2017-12-18 22:24:48 +01:00
vanhofen
7e7fc36cdc icons: add default hint icon 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: da3957b735
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-18 (Mon, 18 Dec 2017)

Origin message was:
------------------
- icons: add default hint icon

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-18 22:24:48 +01:00
Thilo Graf
29741092ff Icons: add missing hint icons and fix some files with format errors 
Origin commit data
------------------
Commit: b9f0bf8f7d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-18 (Mon, 18 Dec 2017)
 2017-12-18 22:24:48 +01:00
vanhofen
2417562648 icons: install missing lcd4linux hint icon 
Origin commit data
------------------
Commit: 7be696ce9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-18 (Mon, 18 Dec 2017)

Origin message was:
------------------
- icons: install missing lcd4linux hint icon
 2017-12-18 11:04:59 +01:00
vanhofen
7c93e5822f icons: add default hint icon 
Origin commit data
------------------
Commit: 8137a4cdb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-18 (Mon, 18 Dec 2017)

Origin message was:
------------------
- icons: add default hint icon
 2017-12-18 11:00:17 +01:00
vanhofen
48ea87774a icons: add some more missing hint icons for settings manager 
Origin commit data
------------------
Commit: 736f778601
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-18 (Mon, 18 Dec 2017)

Origin message was:
------------------
- icons: add some more missing hint icons for settings manager
 2017-12-18 10:15:15 +01:00
vanhofen
6faf0d677f icons: add material style hint_saveas icon 
Origin commit data
------------------
Commit: 9088eb5a46
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-17 (Sun, 17 Dec 2017)

Origin message was:
------------------
- icons: add material style hint_saveas icon
 2017-12-17 23:56:45 +01:00
vanhofen
dacaa76427 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	data/icons/headers/mainmenue.png
	data/icons/headers/settings.png
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/settings_manager.cpp


Origin commit data
------------------
Commit: d756ed789a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-17 (Sun, 17 Dec 2017)
 2017-12-17 23:38:33 +01:00
Thilo Graf
3f9101a5f4 icons: fix assignment of settings, network and mainmenu icons 
Assignment was confused. There are probaly more.


Origin commit data
------------------
Commit: f38e03a431
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-17 (Sun, 17 Dec 2017)
 2017-12-17 23:17:48 +01:00
vanhofen
68f80a3a7e settings_manager: remember last used directory 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/settings_manager.cpp

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


Origin commit data
------------------
Commit: 483f4053a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-15 (Fri, 15 Dec 2017)

Origin message was:
------------------
- settings_manager: remember last used directory

 Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/settings_manager.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-17 23:17:17 +01:00
Thilo Graf
174d00c2a5 icons: add missing picon vor save as 
Origin commit data
------------------
Commit: aa1c16609c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-17 (Sun, 17 Dec 2017)
 2017-12-17 15:06:46 +01:00
vanhofen
fc0c1ac32d settings_manager: remember last used directory 
Origin commit data
------------------
Commit: 864907a95f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-15 (Fri, 15 Dec 2017)

Origin message was:
------------------
- settings_manager: remember last used directory
 2017-12-15 23:20:55 +01:00
vanhofen
776ba2d48c locale: small changes in infobar ca system locales 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: cb7cf4a225
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-12 (Tue, 12 Dec 2017)

Origin message was:
------------------
- locale: small changes in infobar ca system locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-15 18:42:13 +01:00
Thilo Graf
deddeb1fa2 data: update crypt icons 
thx OneOfNine


Origin commit data
------------------
Commit: 3a2f289ad9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-12 (Tue, 12 Dec 2017)
 2017-12-15 18:42:07 +01:00
vanhofen
651719255f locale: small changes in infobar ca system locales 
Origin commit data
------------------
Commit: 8e97f9837d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-12 (Tue, 12 Dec 2017)

Origin message was:
------------------
- locale: small changes in infobar ca system locales
 2017-12-12 12:01:36 +01:00
vanhofen
46474c8fdf icons: add tandberg crypt icons 
Origin commit data
------------------
Commit: 745735431a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)

Origin message was:
------------------
- icons: add tandberg crypt icons
 2017-12-11 21:00:17 +01:00
vanhofen
6834f27166 webradio_usr.xml: add link to stompfm.de 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: e11610bf32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-09 (Sat, 09 Dec 2017)

Origin message was:
------------------
- webradio_usr.xml: add link to stompfm.de

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-10 19:56:11 +01:00
vanhofen
b6360e7006 webradio_usr.xml: add link to stompfm.de 
Origin commit data
------------------
Commit: c6c5153d6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-09 (Sat, 09 Dec 2017)

Origin message was:
------------------
- webradio_usr.xml: add link to stompfm.de
 2017-12-09 23:21:14 +01:00
vanhofen
b4d46ba7c7 locale: clarify timerlist.ask_to_delete locale 
Origin commit data
------------------
Commit: 175e452441
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-09 (Sat, 09 Dec 2017)

Origin message was:
------------------
- locale: clarify timerlist.ask_to_delete locale
 2017-12-09 22:52:14 +01:00
vanhofen
ee09aa2565 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: c35e647878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-07 (Thu, 07 Dec 2017)
 2017-12-07 12:17:23 +01:00
TangoCash
4e629a49a5 add DVB-S2X support 
Origin commit data
------------------
Commit: 4e65f22bdf
Author: TangoCash <eric@loxat.de>
Date: 2017-12-04 (Mon, 04 Dec 2017)
 2017-12-06 10:47:36 +01:00
Thilo Graf
a9881b3636 localize: try to fix different path to iso tab 
Origin commit data
------------------
Commit: 3c859db7c4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-06 (Wed, 06 Dec 2017)
 2017-12-06 10:46:27 +01:00
Thilo Graf
7a1ca16d2f yWeb Help: remove invalid help links 
Origin commit data
------------------
Commit: 114cd36e55
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-05 (Tue, 05 Dec 2017)
 2017-12-05 16:14:04 +01:00
TangoCash
a45170bce6 add DVB-S2X support 
Origin commit data
------------------
Commit: 5f24f44353
Author: TangoCash <eric@loxat.de>
Date: 2017-12-04 (Mon, 04 Dec 2017)
 2017-12-04 09:46:04 +01:00
vanhofen
df04e34248 icons: cleanup from unused icons 
Conflicts:
	data/icons/buttons/orphaned/0-green.png
	data/icons/buttons/orphaned/0-red.png
	data/icons/buttons/orphaned/1-green.png
	data/icons/buttons/orphaned/1-red.png
	data/icons/buttons/orphaned/2-green.png
	data/icons/buttons/orphaned/2-red.png
	data/icons/buttons/orphaned/3-green.png
	data/icons/buttons/orphaned/3-red.png
	data/icons/buttons/orphaned/4-green.png
	data/icons/buttons/orphaned/4-red.png
	data/icons/buttons/orphaned/5-green.png
	data/icons/buttons/orphaned/5-red.png
	data/icons/buttons/orphaned/6-green.png
	data/icons/buttons/orphaned/6-red.png
	data/icons/buttons/orphaned/7-green.png
	data/icons/buttons/orphaned/7-red.png
	data/icons/buttons/orphaned/8-green.png
	data/icons/buttons/orphaned/8-red.png
	data/icons/buttons/orphaned/9-green.png
	data/icons/buttons/orphaned/9-red.png
	data/icons/buttons/orphaned/longpress.png
	data/icons/hints/hint_rass.png
	data/icons/hints/hint_spark.png
	data/icons/various/rass.png

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


Origin commit data
------------------
Commit: 47a6385767
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- icons: cleanup from unused icons

 Conflicts:
	data/icons/buttons/orphaned/0-green.png
	data/icons/buttons/orphaned/0-red.png
	data/icons/buttons/orphaned/1-green.png
	data/icons/buttons/orphaned/1-red.png
	data/icons/buttons/orphaned/2-green.png
	data/icons/buttons/orphaned/2-red.png
	data/icons/buttons/orphaned/3-green.png
	data/icons/buttons/orphaned/3-red.png
	data/icons/buttons/orphaned/4-green.png
	data/icons/buttons/orphaned/4-red.png
	data/icons/buttons/orphaned/5-green.png
	data/icons/buttons/orphaned/5-red.png
	data/icons/buttons/orphaned/6-green.png
	data/icons/buttons/orphaned/6-red.png
	data/icons/buttons/orphaned/7-green.png
	data/icons/buttons/orphaned/7-red.png
	data/icons/buttons/orphaned/8-green.png
	data/icons/buttons/orphaned/8-red.png
	data/icons/buttons/orphaned/9-green.png
	data/icons/buttons/orphaned/9-red.png
	data/icons/buttons/orphaned/longpress.png
	data/icons/hints/hint_rass.png
	data/icons/hints/hint_spark.png
	data/icons/various/rass.png

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-01 14:26:33 +01:00
vanhofen
eee00885ef locale: minor changes on new tunersetup locales 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 7e8b866425
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- locale: minor changes on new tunersetup locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-01 14:26:27 +01:00
TangoCash
230d8a2c0f add DVB-T2 support, enable 5V supply 
Origin commit data
------------------
Commit: e4bdd4700d
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
 2017-11-28 10:52:01 +01:00
vanhofen
68bf0eecd2 icons: cleanup from unused icons 
Origin commit data
------------------
Commit: 1c638ba13d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- icons: cleanup from unused icons
 2017-11-27 16:04:43 +01:00
vanhofen
50cb93af8c locale: minor changes on new tunersetup locales 
Origin commit data
------------------
Commit: 090fcd4e54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- locale: minor changes on new tunersetup locales
 2017-11-27 10:22:52 +01:00
TangoCash
66ab9eca6d add DVB-T2 support, enable 5V supply 
Origin commit data
------------------
Commit: 91379feece
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
 2017-11-27 10:22:52 +01:00
vanhofen
2ab1a35f43 cablex.xml: add OstTelCom; thx to elstablo 
http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 8cefe9a1d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- cablex.xml: add OstTelCom; thx to elstablo

http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-25 21:20:24 +01:00
vanhofen
9175b38813 webtv-setup: clearify hint for autoload item 
Origin commit data
------------------
Commit: 9b53d11357
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- webtv-setup: clearify hint for autoload item
 2017-11-25 09:58:55 +01:00
vanhofen
6e8c2ed210 cablex.xml: add OstTelCom; thx to elstablo 
http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037


Origin commit data
------------------
Commit: 9f5e61b366
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- cablex.xml: add OstTelCom; thx to elstablo

http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037
 2017-11-25 09:57:15 +01:00
vanhofen
995674ce3a flash.start: minor changes in script comments 
Origin commit data
------------------
Commit: 377db428fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)

Origin message was:
------------------
- flash.start: minor changes in script comments
 2017-11-23 17:23:01 +01:00
vanhofen
e80a6de5f3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	data/Makefile.am
	src/driver/rcinput.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h
	src/zapit/src/capmt.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: fcd6b905ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-16 (Thu, 16 Nov 2017)
 2017-11-16 22:05:24 +01:00
vanhofen
551555d7b7 vfd-setup: allow to set scroll_repeats if possible 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: dbf2fa3f18
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- vfd-setup: allow to set scroll_repeats if possible

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 20:39:34 +01:00
vanhofen
d5eaa7dc47 cables.xml: use german umlauts for german nets; ... 
Note: encoding is iso-8859-1
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 01a04014be
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-12 (Sun, 12 Nov 2017)

Origin message was:
------------------
- cables.xml: use german umlauts for german nets; ...

Note: encoding is iso-8859-1
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
gixxpunk
4436af0551 shorten string 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 9c041c5961
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-08 (Wed, 08 Nov 2017)

Origin message was:
------------------
- shorten string

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
e3da5ec952 locale: minor changes in streaminfo locales 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 29580c7417
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- locale: minor changes in streaminfo locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
ee6dc8f1c6 streaminfo: port from TangoCash 
Conflicts:
	src/gui/streaminfo2.cpp

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


Origin commit data
------------------
Commit: ffb15f08cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: port from TangoCash

 Conflicts:
	src/gui/streaminfo2.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
gixxpunk
c5d8306234 yweb: optimize png images for size 
Conflicts:
	data/y-web/images/blank.png
	data/y-web/images/cancel.png
	data/y-web/images/colored_bar.png
	data/y-web/images/server_add.png
	data/y-web/images/server_delete.png
	data/y-web/images/server_edit.png
	data/y-web/images/server_link.png

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


Origin commit data
------------------
Commit: c82ba48597
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- yweb: optimize png images for size

 Conflicts:
	data/y-web/images/blank.png
	data/y-web/images/cancel.png
	data/y-web/images/colored_bar.png
	data/y-web/images/server_add.png
	data/y-web/images/server_delete.png
	data/y-web/images/server_edit.png
	data/y-web/images/server_link.png

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
gixxpunk
07e21d54d8 yweb: install only box specific remote control pictures 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 0cfa8b8381
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- yweb: install only box specific remote control pictures

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00